From: Vlad Date: Fri, 3 Sep 2010 08:52:26 +0000 (+0300) Subject: added message window X-Git-Url: http://vcs.maemo.org/git/?p=livewp;a=commitdiff_plain;h=881c9dcda97b09e9f645f96e2bd82c9bf959a337 added message window --- diff --git a/applet/data/Makefile b/applet/data/Makefile index 9e98a01..64c22f5 100644 --- a/applet/data/Makefile +++ b/applet/data/Makefile @@ -55,7 +55,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_triplet = i486-pc-linux-gnu +host_triplet = arm-unknown-linux-gnueabi subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -88,27 +88,27 @@ DATA = $(acceltheme_DATA) $(berlintheme_DATA) $(colorfloodtheme_DATA) \ $(fifteentheme_DATA) $(matrixtheme_DATA) $(moderntheme_DATA) \ $(orrerytheme_DATA) $(videotheme_DATA) $(xsnowtheme_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/tanya/livewp/applet/missing --run aclocal-1.8 +ACLOCAL = ${SHELL} /home/vlad/livewp/applet/missing --run aclocal-1.8 ALL_LINGUAS = ru_RU fi_FI es_ES es_MX AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/tanya/livewp/applet/missing --run tar -AR = i486-linux-gnu-ar -AUTOCONF = ${SHELL} /home/tanya/livewp/applet/missing --run autoconf -AUTOHEADER = ${SHELL} /home/tanya/livewp/applet/missing --run autoheader -AUTOMAKE = ${SHELL} /home/tanya/livewp/applet/missing --run automake-1.8 +AMTAR = ${SHELL} /home/vlad/livewp/applet/missing --run tar +AR = arm-linux-gnueabi-ar +AUTOCONF = ${SHELL} /home/vlad/livewp/applet/missing --run autoconf +AUTOHEADER = ${SHELL} /home/vlad/livewp/applet/missing --run autoheader +AUTOMAKE = ${SHELL} /home/vlad/livewp/applet/missing --run automake-1.8 AWK = gawk CATALOGS = ru_RU.gmo fi_FI.gmo es_ES.gmo es_MX.gmo CATOBJEXT = .gmo -CC = i486-linux-gnu-gcc +CC = arm-linux-gnueabi-gcc CCDEPMODE = depmode=gcc3 CFLAGS = -Wall -g -O2 CONTROLPANEL_CFLAGS = -DMAEMO_CHANGES -DMAEMO_GTK -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 CONTROLPANEL_LIBS = -lhildon-1 -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 -CPP = i486-linux-gnu-gcc -E +CPP = arm-linux-gnueabi-gcc -E CPPFLAGS = -CXX = i486-linux-gnu-g++ -CXXCPP = i486-linux-gnu-g++ -E +CXX = arm-linux-gnueabi-g++ +CXXCPP = arm-linux-gnueabi-g++ -E CXXDEPMODE = depmode=gcc3 CXXFLAGS = -g -O2 CYGPATH_W = echo @@ -168,7 +168,7 @@ LN_S = ln -s LTLIBOBJS = MAEMO_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 -I/usr/include/hildon-fm-2 -I/usr/include/gstreamer-0.10 -I/usr/include/libxml2 MAEMO_LIBS = -pthread -lhildondesktop-1 -lhildon-1 -lhildonfm -lgnomevfs-2 -lgconf-2 -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 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0 -MAKEINFO = ${SHELL} /home/tanya/livewp/applet/missing --run makeinfo +MAKEINFO = ${SHELL} /home/vlad/livewp/applet/missing --run makeinfo MKINSTALLDIRS = ./mkinstalldirs MSGFMT = /scratchbox/tools/bin/msgfmt MSGFMT_OPTS = -c @@ -189,13 +189,13 @@ POFILES = ru_RU.po fi_FI.po es_ES.po es_MX.po POSUB = po PO_IN_DATADIR_FALSE = PO_IN_DATADIR_TRUE = -RANLIB = i486-linux-gnu-ranlib +RANLIB = arm-linux-gnueabi-ranlib SED = /scratchbox/tools/bin/sed SET_MAKE = SHELL = /bin/sh SQLITE_CFLAGS = SQLITE_LIBS = -lsqlite3 -STRIP = i486-linux-gnu-strip +STRIP = arm-linux-gnueabi-strip USE_NLS = yes VERSION = 0.9 XGETTEXT = /scratchbox/tools/bin/xgettext @@ -210,25 +210,25 @@ am__include = include am__leading_dot = . am__quote = bindir = ${exec_prefix}/bin -build = i486-pc-linux-gnu -build_alias = i486-linux-gnu -build_cpu = i486 -build_os = linux-gnu -build_vendor = pc +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 = i486-pc-linux-gnu -host_alias = i486-linux-gnu -host_cpu = i486 -host_os = linux-gnu -host_vendor = pc +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/livewp/applet/install-sh +install_sh = /home/vlad/livewp/applet/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = /usr/share/locale diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index 7caefd1..047c434 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -485,6 +485,7 @@ void lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){ gint result; GtkWidget *window = NULL; + GtkWidget *banner = NULL; GtkWidget *area_hbox; GtkWidget *one_in_all_view_button; gboolean one_in_all_view; @@ -546,11 +547,20 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){ if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)) != one_in_all_view){ save_one_in_all_views_to_config(hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button))); fprintf(stderr,"CHECK!!!!!!!!!!!!!!\n"); + banner = hildon_banner_show_information (window, NULL, _("Livewallpaper is reloading...")); + hildon_banner_set_timeout(banner, 3000); + gtk_widget_show(banner); + gtk_main_iteration_do(FALSE); stop_applet(1); stop_applet(2); stop_applet(3); stop_applet(4); - sleep(7); + sleep(1); + gtk_main_iteration_do(FALSE); + sleep(1); + gtk_main_iteration_do(FALSE); + sleep(1); + gtk_main_iteration_do(FALSE); start_applet(1); start_applet(2); start_applet(3);