123

diff --git a/applet/data/sky_dark.png b/applet/data/sky_dark.png
new file mode 100644 (file)
index 0000000..3af5242
Binary files /dev/null and b/applet/data/sky_dark.png differ

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index d85213a..432bbdf 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -156,16 +156,15 @@ actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z)
 }
 
 static GtkWidget* 
-init_object(gchar * name, gint x, gint y, gint z, gint width, gint height, void (*pfunc)(GtkWidget*, gpointer))
+init_object(gchar * name, gchar * filename, gint x, gint y, gint z, gint width, gint height, gboolean visible, gint scale, gint opacity, void (*pfunc)(GtkWidget*, gpointer))
 {
   GtkWidget *actor;
   GdkPixbuf *pixbuf;
   GtkWidget *image;
-  gdouble scale = 1.0;
 
   actor = hildon_animation_actor_new();
   gchar str[256];
-  snprintf(str, 255, "/usr/share/anwall/%s.png", name);
+  snprintf(str, 255, "/usr/share/anwall/%s", filename);
   //fprintf(stderr, "!!!init object !!!!\nname = %s file = %s\n", name, str);
   pixbuf = gdk_pixbuf_new_from_file_at_size (str, 
                                              width, 
@@ -180,17 +179,18 @@ init_object(gchar * name, gint x, gint y, gint z, gint width, gint height, void
   gtk_container_add (GTK_CONTAINER (actor), image);
 
   actor_set_position_full(actor, x, y, z);
-  hildon_animation_actor_set_show (actor, 1);
+  hildon_animation_actor_set_show (actor, visible);
   realize(actor);
   gtk_widget_show_all(actor);
   g_object_set_data(G_OBJECT(actor), "name", name);
+  g_object_set_data(G_OBJECT(actor), "filename", filename);
   g_object_set_data(G_OBJECT(actor), "image", image);
   g_object_set_data(G_OBJECT(actor), "x", x);
   g_object_set_data(G_OBJECT(actor), "y", y);
   g_object_set_data(G_OBJECT(actor), "z", z);
-  g_object_set_data(G_OBJECT(actor), "scale", 10);
-  g_object_set_data(G_OBJECT(actor), "visible", 1);
-  g_object_set_data(G_OBJECT(actor), "opacity", 255);
+  g_object_set_data(G_OBJECT(actor), "scale", scale);
+  g_object_set_data(G_OBJECT(actor), "visible", visible);
+  g_object_set_data(G_OBJECT(actor), "opacity", opacity);
   g_object_set_data(G_OBJECT(actor), "func", pfunc);
   
   hildon_animation_actor_set_parent (HILDON_ANIMATION_ACTOR (actor), scene.window);
@@ -234,7 +234,7 @@ void change_sky(GtkWidget * actor, gpointer data)
     fprintf(stderr, "change sky \n");
     if (actor){
         daytime = get_daytime();
-        opacity = g_object_get_data(G_OBJECT(actor), "opacity") - 1;
+        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);
@@ -278,19 +278,20 @@ init_scene(GtkWidget *window)
 
   get_sun_pos(&alt, &azm);
   get_sun_screen_pos(alt, azm, &x, &y);
-  actor = init_object("sun", x, y, 20, 88, 88, &change_sun);
+  actor = init_object("sun", "sun.png", x, y, 20, 88, 88, 1, 10, 255, &change_sun);
   //scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
   //ma1->multiactor_init("sun", g_slist_append(list, G_OBJECT(actor)));
 
-  actor = init_object("sky_dark", 0, 0, 4, 800, 480, NULL);
+  actor = init_object("background", "sky_dark.png", 0, 0, 4, 800, 480, 1, 10, 255, NULL);
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
 
-  actor = init_object("sky", 0, 0, 5, 800, 480, &change_sky);
+  actor = init_object("sky", "sky.png", 0, 0, 5, 800, 480, 1, 10, 255, &change_sky);
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
 
-  actor = init_object("town", 0, 0, 10, 800, 480, NULL);
+  actor = init_object("town", "town.png", 0, 0, 10, 800, 480, 1, 10, 255, NULL);
   scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
+  
 /*
   actor = init_object("cloud1", 400, 150, 2, 200, 150, NULL);
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
@@ -504,7 +505,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
   gtk_container_add (GTK_CONTAINER (desktop_plugin), label);
   init_applet_position();
   init_scene(desktop_plugin);
-  desktop_plugin->timer = g_timeout_add(100, plugin_on_timeout, desktop_plugin);
+  desktop_plugin->timer = g_timeout_add(1000*10, plugin_on_timeout, desktop_plugin);
 }
 
 static void