From: vlad Date: Sat, 10 Apr 2010 12:48:39 +0000 (+0300) Subject: version 0.1 is released X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=6fcb303d01b42c87b2c63a395f6378ec1e528854;p=livewp version 0.1 is released --- diff --git a/applet/configure.ac b/applet/configure.ac index 2cde477..5eacb12 100644 --- a/applet/configure.ac +++ b/applet/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.61) -AC_INIT([livewp], [0.1]) +AC_INIT([livewp], [0.2]) AC_CONFIG_SRCDIR([src/livewp-home-widget.c]) -AM_INIT_AUTOMAKE(livewp, 0.1) +AM_INIT_AUTOMAKE(livewp, 0.2) AC_CONFIG_HEADER([config.h]) AC_PROG_LIBTOOL AC_PROG_INTLTOOL([0.23]) diff --git a/applet/data/Makefile b/applet/data/Makefile deleted file mode 100644 index f454e5a..0000000 --- a/applet/data/Makefile +++ /dev/null @@ -1,432 +0,0 @@ -# Makefile.in generated by automake 1.8.5 from Makefile.am. -# data/Makefile. Generated from Makefile.in by configure. - -# 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. - - - -# -# 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 = . -top_srcdir = .. - -pkgdatadir = $(datadir)/livewp -pkglibdir = $(libdir)/livewp -pkgincludedir = $(includedir)/livewp -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /scratchbox/tools/bin/install -c -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 = arm-unknown-linux-gnueabi -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)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(modernthemedir)" -berlinthemeDATA_INSTALL = $(INSTALL_DATA) -modernthemeDATA_INSTALL = $(INSTALL_DATA) -DATA = $(berlintheme_DATA) $(moderntheme_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/tanya/work/livewp/applet/missing --run aclocal-1.8 -ALL_LINGUAS = ru_RU -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/tanya/work/livewp/applet/missing --run tar -AR = arm-linux-gnueabi-ar -AUTOCONF = ${SHELL} /home/tanya/work/livewp/applet/missing --run autoconf -AUTOHEADER = ${SHELL} /home/tanya/work/livewp/applet/missing --run autoheader -AUTOMAKE = ${SHELL} /home/tanya/work/livewp/applet/missing --run automake-1.8 -AWK = gawk -CATALOGS = ru_RU.gmo -CATOBJEXT = .gmo -CC = arm-linux-gnueabi-gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -Wall -g -O2 -CPP = arm-linux-gnueabi-gcc -E -CPPFLAGS = -CXX = arm-linux-gnueabi-g++ -CXXCPP = arm-linux-gnueabi-g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -CYGPATH_W = echo -DATADIRNAME = share -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DSYMUTIL = -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = /scratchbox/tools/bin/grep -E -EXAMPLE_CFLAGS = -DMAEMO_CHANGES -DMAEMO_GTK -pthread -I/usr/include/hildon-1 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libhildondesktop-1 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gconf/2 -EXAMPLE_LIBS = -pthread -lhildondesktop-1 -lhildon-1 -lgnomevfs-2 -lgconf-2 -lgthread-2.0 -lrt -ldbus-glib-1 -ldbus-1 -lpthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -EXEEXT = -F77 = -FFLAGS = -GETTEXT_PACKAGE = livewp -GMOFILES = ru_RU.gmo -GMSGFMT = /scratchbox/tools/bin/msgfmt -GREP = /scratchbox/tools/bin/grep -HILDON_DESKTOP_LIB_DIR = /usr/lib/hildon-desktop -HILDON_HOME_DESKTOP_DIR = /usr/share/applications/hildon-home -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -INSTOBJEXT = .mo -INTLLIBS = -INTLTOOL_CAVES_RULE = %.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_DESKTOP_RULE = %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_DIRECTORY_RULE = %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_EXTRACT = /scratchbox/devkits/doctools/bin/intltool-extract -INTLTOOL_KBD_RULE = %.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_KEYS_RULE = %.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_MERGE = /scratchbox/devkits/doctools/bin/intltool-merge -INTLTOOL_OAF_RULE = %.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@ -INTLTOOL_PERL = /scratchbox/tools/bin/perl -INTLTOOL_POLICY_RULE = %.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_PONG_RULE = %.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_PROP_RULE = %.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_SCHEMAS_RULE = %.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_SERVER_RULE = %.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_SERVICE_RULE = %.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_SHEET_RULE = %.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_SOUNDLIST_RULE = %.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_THEME_RULE = %.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_UI_RULE = %.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_UPDATE = /scratchbox/devkits/doctools/bin/intltool-update -INTLTOOL_XAM_RULE = %.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -INTLTOOL_XML_NOMERGE_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ -INTLTOOL_XML_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -LDFLAGS = -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -MAKEINFO = ${SHELL} /home/tanya/work/livewp/applet/missing --run makeinfo -MKINSTALLDIRS = ./mkinstalldirs -MSGFMT = /scratchbox/tools/bin/msgfmt -MSGFMT_OPTS = -c -MSGMERGE = /scratchbox/tools/bin/msgmerge -NMEDIT = -OBJEXT = o -PACKAGE = livewp -PACKAGE_BUGREPORT = -PACKAGE_NAME = livewp -PACKAGE_STRING = livewp 0.1 -PACKAGE_TARNAME = livewp -PACKAGE_VERSION = 0.1 -PATH_SEPARATOR = : -PKG_CONFIG = /scratchbox/tools/bin/pkg-config -POFILES = ru_RU.po -POSUB = po -PO_IN_DATADIR_FALSE = -PO_IN_DATADIR_TRUE = -RANLIB = arm-linux-gnueabi-ranlib -SED = /scratchbox/tools/bin/sed -SET_MAKE = -SHELL = /bin/sh -STRIP = arm-linux-gnueabi-strip -USE_NLS = yes -VERSION = 0.1 -XGETTEXT = /scratchbox/tools/bin/xgettext -ac_ct_CC = -ac_ct_CXX = -ac_ct_F77 = -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -bindir = ${exec_prefix}/bin -build = arm-unknown-linux-gnueabi -build_alias = arm-linux-gnueabi -build_cpu = arm -build_os = linux-gnueabi -build_vendor = unknown -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} -dvidir = ${docdir} -exec_prefix = ${prefix} -host = arm-unknown-linux-gnueabi -host_alias = arm-linux-gnueabi -host_cpu = arm -host_os = linux-gnueabi -host_vendor = unknown -htmldir = ${docdir} -includedir = ${prefix}/include -infodir = ${prefix}/share/info -install_sh = /home/tanya/work/livewp/applet/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localedir = /usr/share/locale -localstatedir = ${prefix}/var -mandir = ${prefix}/share/man -mkdir_p = mkdir -p -- . -oldincludedir = /usr/include -pdfdir = ${docdir} -prefix = /usr -program_transform_name = s,x,x, -psdir = ${docdir} -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -berlinthemedir = $(datadir)/livewp/theme/Berlin -berlintheme_DATA = theme/Berlin/* -modernthemedir = $(datadir)/livewp/theme/Modern -moderntheme_DATA = theme/Modern/* -EXTRA_DIST = $(berlintheme_DATA) $(moderntheme_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-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-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 -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/theme/Berlin $(distdir)/theme/Modern - @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)$(berlinthemedir)" "$(DESTDIR)$(modernthemedir)"; 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-berlinthemeDATA install-modernthemeDATA - -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-berlinthemeDATA uninstall-info-am \ - 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-exec install-exec-am install-info install-info-am \ - install-man 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-info-am \ - uninstall-modernthemeDATA - -# 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/debian/changelog b/applet/debian/changelog index ff292f5..ddb74ad 100644 --- a/applet/debian/changelog +++ b/applet/debian/changelog @@ -1,3 +1,9 @@ +live-wallpaper (0.2) unstable; urgency=low + + * Some changes + + -- Vlad Vasiliev Mon, 12 Apr 2010 14:11:10 +0200 + live-wallpaper (0.1) unstable; urgency=low * First release diff --git a/applet/debian/rules b/applet/debian/rules index 0bd8d42..5c607a3 100644 --- a/applet/debian/rules +++ b/applet/debian/rules @@ -97,6 +97,7 @@ binary-arch: build install dh_installdeb dh_shlibdeps dh_gencontrol + maemo-optify dh_md5sums dh_builddeb diff --git a/applet/po/ru_RU.po b/applet/po/ru_RU.po index c4a2b9f..76c04e6 100644 --- a/applet/po/ru_RU.po +++ b/applet/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-09 21:41+0300\n" +"POT-Creation-Date: 2010-04-10 14:58+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Vlad Vasiliev \n" "Language-Team: LANGUAGE \n" @@ -19,8 +19,7 @@ msgstr "" msgid "About" msgstr "О программе" -#: src/livewp-settings.c:55 src/livewp-settings.c:72 src/livewp-settings.c:74 -#: src/livewp-settings.c:112 +#: src/livewp-settings.c:55 src/livewp-settings.c:74 src/livewp-settings.c:112 msgid "Berlin" msgstr "Берлин" @@ -46,8 +45,7 @@ msgstr "" msgid "Live Wallpaper Settings" msgstr "Настройка Live Wallpaper" -#: src/livewp-settings.c:56 src/livewp-settings.c:76 src/livewp-settings.c:78 -#: src/livewp-settings.c:114 +#: src/livewp-settings.c:56 src/livewp-settings.c:78 src/livewp-settings.c:114 msgid "Modern" msgstr "Модерн" diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c index 67881dc..52a2651 100644 --- a/applet/src/livewp-home-widget.c +++ b/applet/src/livewp-home-widget.c @@ -155,11 +155,8 @@ init_applet_position(void) void actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z) { - fprintf(stderr, "actor_set_position_full z=%d\n", z); +/* fprintf(stderr, "actor_set_position_full z=%d\n", z); */ hildon_animation_actor_set_position_full (HILDON_ANIMATION_ACTOR (actor),x-xapplet, y-yapplet, z); - //hildon_animation_actor_set_position (HILDON_ANIMATION_ACTOR (actor),x-xapplet, y-yapplet); - //hildon_animation_actor_set_depth (HILDON_ANIMATION_ACTOR (actor), z); - } static gint @@ -239,7 +236,6 @@ change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin) actor->visible = TRUE; phase = get_moon_phase(); newfile = g_strdup_printf( "%s%d.png", actor->name, phase); - actor->filename = newfile; create_hildon_actor(actor, desktop_plugin); @@ -337,7 +333,7 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin) GtkWidget *image = NULL; gchar *str; - fprintf(stderr, "create_hildon_actor %s\n", actor->name); + /* fprintf(stderr, "create_hildon_actor %s\n", actor->name);*/ ha = hildon_animation_actor_new(); str = g_strdup_printf( "%s/%s/%s", THEME_PATH, desktop_plugin->priv->theme, actor->filename); @@ -375,7 +371,6 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin) g_object_set_data(G_OBJECT(ha), "func", pfunc); */ hildon_animation_actor_set_parent (HILDON_ANIMATION_ACTOR (ha), desktop_plugin); - fprintf(stderr, "ha %p\n", ha); actor->widget = ha; } @@ -427,39 +422,6 @@ change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin) -void change_sky(GtkWidget * actor, gpointer data) -{ - gint daytime, opacity; - //fprintf(stderr, "change sky \n"); - if (actor){ - daytime = get_daytime(); - opacity = g_object_get_data(G_OBJECT(actor), "opacity") - 10; - if (opacity < 0) opacity = 255; - hildon_animation_actor_set_show_full(actor, 1, opacity); - g_object_set_data(G_OBJECT(actor), "opacity", opacity); - switch (daytime){ - case TIME_NIGHT: - //fprintf(stderr, "change sky night\n"); - break; - case TIME_DAY: - //fprintf(stderr, "change sky day\n"); - break; - - } - } -} -void -change_background(GtkWidget * actor, gpointer data) -{ - gint opacity; - if (actor){ - opacity = g_object_get_data(G_OBJECT(actor), "opacity") - 1; - if (opacity < 0) opacity = 255; - hildon_animation_actor_set_show_full(actor, 1, opacity); - g_object_set_data(G_OBJECT(actor), "opacity", opacity); - - } -} static gint get_time(gint t){ @@ -507,21 +469,15 @@ init_scene(AWallpaperPlugin *desktop_plugin) { Actor *actor; -fprintf(stderr, "init scene \n"); + /* fprintf(stderr, "init scene \n");*/ scene.daytime = get_daytime(); scene.actors = NULL; - //get_sun_pos(&alt, &azm); - //get_sun_screen_pos(alt, azm, &x, &y); - - - //scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor)); - + actor = init_object(desktop_plugin, "sky", "sky0.png", 0, 0, 5, 800, 480, TRUE, 100, 255, &change_static_actor, NULL); change_static_actor(actor, desktop_plugin); scene.actors = g_slist_append(scene.actors, actor); - actor = init_object(desktop_plugin, "sun", "sun.png", 0, 0, 6, 88, 88, TRUE, 100, 255, &change_sun, &probability_sun); actor->time_start_animation = time(NULL); @@ -545,10 +501,6 @@ fprintf(stderr, "init scene \n"); change_moon(actor, desktop_plugin); scene.actors = g_slist_append(scene.actors, actor); - //if (scene.daytime == TIME_DAY) snprintf(str, 255, "tram.png"); - //else snprintf(str, 255, "tram_dark.png"); - //actor = init_object("tram", "tram.png", -300, 191, 25, 350, 210, 1, 100, 255, NULL); - actor = init_object(desktop_plugin, "tram", "tram.png", -300, 225, 8, 350, 210, FALSE, 100, 255, &change_tram, NULL); actor->time_start_animation = time(NULL) + 10; @@ -720,12 +672,12 @@ short_timeout (AWallpaperPlugin *desktop_plugin) gint t; Actor *actor; gboolean stop_flag = TRUE; - + if (!desktop_plugin->priv->visible) return TRUE; - + now = time(NULL); - //fprintf(stderr, "Short timer %d\n", now); + /* fprintf(stderr, "Short timer %d\n", now); */ tmp = scene.actors; while (tmp != NULL){ actor = tmp->data; @@ -740,7 +692,6 @@ short_timeout (AWallpaperPlugin *desktop_plugin) } tmp = g_slist_next(tmp); } - scene.daytime = daytime; if (stop_flag){ desktop_plugin->priv->short_timer = 0; @@ -786,7 +737,7 @@ long_timeout (AWallpaperPlugin *desktop_plugin) && actor->time_start_animation > 0 && desktop_plugin->priv->short_timer == 0){ actor->time_start_animation = now; - fprintf(stderr, "start shor timer act = %s %d\n", actor->name, now); + /* fprintf(stderr, "start short timer act = %s %d\n", actor->name, now); */ desktop_plugin->priv->short_timer = g_timeout_add(SHORT_TIMER, short_timeout, desktop_plugin); } tmp = g_slist_next(tmp); diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index e530d24..8996310 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -99,13 +99,12 @@ lw_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv){ theme_button, TRUE, TRUE, 0); gtk_widget_show (theme_button); gtk_widget_show (window); - save_button = gtk_dialog_add_button(GTK_DIALOG(window), _("Save"), GTK_RESPONSE_YES); gtk_dialog_add_button(GTK_DIALOG(window), _("About"), GTK_RESPONSE_NO); + save_button = gtk_dialog_add_button(GTK_DIALOG(window), _("Save"), GTK_RESPONSE_YES); result = gtk_dialog_run(GTK_DIALOG(window)); switch(result){ case GTK_RESPONSE_YES: - fprintf(stderr,"Yes\n"); if (hildon_button_get_value(HILDON_BUTTON (theme_button))){ if (priv->theme) g_free(priv->theme);