adde images for notifications
[livewp] / applet / src / livewp-home-widget.c
index 38f2522..aa10397 100644 (file)
@@ -26,6 +26,7 @@
 #include "livewp-home-widget.h"
 #include <gconf/gconf-client.h>
 #include "livewp-rules.h"
+#include "livewp-scene.h"
 #include <sys/time.h>
 #include <stdlib.h>
 
@@ -161,6 +162,39 @@ destroy_hildon_actor(Actor *actor)
     actor->widget = NULL;
 }
 
+void
+create_hildon_actor_text(Actor *actor, AWallpaperPlugin *desktop_plugin) 
+{
+  GtkWidget *ha = NULL;
+  GdkPixbuf *pixbuf = NULL;
+  GtkWidget *image = NULL;
+  GtkWidget *label = NULL;
+
+  ha = hildon_animation_actor_new();
+  label = gtk_label_new(NULL);  
+
+  if (label){
+    //g_signal_connect(G_OBJECT(label), "expose_event", G_CALLBACK(expose_event), NULL);
+
+    gtk_container_add (GTK_CONTAINER (ha), label);
+  }  
+  realize(ha);
+  gtk_widget_show(label);
+  gtk_widget_show_all(ha);
+  
+  /* TO DO check it */
+  /*  gdk_flush (); */
+
+  //g_object_set_data(G_OBJECT(ha), "image", image);
+  actor->image = label;
+  hildon_animation_actor_set_parent (HILDON_ANIMATION_ACTOR (ha), GTK_WINDOW(desktop_plugin));
+  actor->widget = ha;
+  set_actor_position(actor, actor->x, actor->y, actor->z, desktop_plugin);
+  set_actor_scale(actor, (double)actor->scale/100, (double)actor->scale/100);
+  set_actor_visible(actor, actor->visible);
+}
+
+
 
 void
 create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin) 
@@ -245,683 +279,7 @@ change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
 
 }
 
-static void 
-destroy_scene(AWallpaperPlugin *desktop_plugin)
-{
-    GSList * tmp = desktop_plugin->priv->scene->actors;
-    while (tmp != NULL){
-        destroy_actor(tmp->data);
-        tmp = g_slist_next(tmp);
-    }
-    g_slist_free(tmp);
-
-}
-
-void
-reload_scene(AWallpaperPlugin *desktop_plugin)
-{
-    fprintf(stderr,"Reload scene %s\n", desktop_plugin->priv->theme);  
-    destroy_scene(desktop_plugin);
-    if (!strcmp(desktop_plugin->priv->theme,"Modern"))
-        init_scene(desktop_plugin);
-    else if (!strcmp(desktop_plugin->priv->theme,"Berlin")) 
-        init_scene1(desktop_plugin);
-    else if (!strcmp(desktop_plugin->priv->theme,"Matrix")) 
-        init_scene2(desktop_plugin);
-}
-
-static void
-init_scene2(AWallpaperPlugin *desktop_plugin)
-{
-  Actor *actor;
-  Scene *scene;
-  GPtrArray *child;
-  gint now = time(NULL);
-  gint y1, y2;
-
-  if (desktop_plugin->priv->rich_animation){
-      y1 = -480;
-      y2 = -480-480;
-  }else {
-      y1 = 0;
-      y2 = -480;
-  }
-
-  fprintf(stderr, "init scene2 \n");
-  scene = g_new0(Scene, 1);
-  //scene.daytime = get_daytime();
-  scene->actors = NULL;
-  desktop_plugin->priv->scene = scene;
-  
-  actor = init_object(desktop_plugin, "background", "bg.png", 
-                      0, 0, 5, 800, 480, 
-                      TRUE, TRUE, 100, 255, 
-                      NULL, NULL, NULL);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "symbols", "symbols.png", 
-                      0, 0, 10, 800, 480, 
-                      TRUE, TRUE, 100, 255, 
-                      NULL, NULL, NULL);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  child = g_ptr_array_sized_new(4);
-  actor = init_object(desktop_plugin, "layer1", "layer1_2.png", 
-                      0, y1, 6, 800, 960, 
-                      TRUE, TRUE, 100, 255, 
-                      NULL, NULL, NULL);
-  //actor->time_start_animation = now;
-  //actor->duration_animation = G_MAXINT;
-  scene->actors = g_slist_append(scene->actors, actor);
-  g_ptr_array_add(child, actor);
-
-  actor = init_object(desktop_plugin, "layer1", "layer1_1.png", 
-                      0, y2, 7, 800, 960, 
-                      TRUE, TRUE, 100, 255, 
-                      NULL, NULL, NULL);
-  //actor->time_start_animation = now;
-  //actor->duration_animation = G_MAXINT;
-  scene->actors = g_slist_append(scene->actors, actor);
-  g_ptr_array_add(child, actor);
-
-  actor = init_object(desktop_plugin, "layer2", "layer2_2.png", 
-                      0, y1, 8, 800, 960, 
-                      TRUE, TRUE, 100, 255, 
-                      NULL, NULL, NULL);
-  //actor->time_start_animation = now;
-  //actor->duration_animation = G_MAXINT;
-  scene->actors = g_slist_append(scene->actors, actor);
-  g_ptr_array_add(child, actor);
-
-  actor = init_object(desktop_plugin, "layer2", "layer2_1.png", 
-                      0, y2, 9, 800, 960, 
-                      TRUE, TRUE, 100, 255, 
-                      NULL, NULL, NULL);
-  //actor->time_start_animation = now;
-  //actor->duration_animation = G_MAXINT;
-  scene->actors = g_slist_append(scene->actors, actor);
-  g_ptr_array_add(child, actor);
-
-  actor = init_object(desktop_plugin, "layers", "", 
-                      0, y2, 9, 800, 960, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_layer, 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);
-
-}
-
-/* Init Modern Scene */
-static void
-init_scene(AWallpaperPlugin *desktop_plugin)
-{
-  Actor *actor;
-  Scene *scene;
-  gint now = time(NULL);
-  gint i;
-  gint winds[13][2];
-
-  //fprintf(stderr, "init scene \n");
-  scene = g_new0(Scene, 1);
-  scene->daytime = get_daytime();
-  scene->actors = NULL;
-  scene->wind_orientation = -1;
-  scene->wind_angle = 0.3;
-  /* init value for random */
-  scene->seed = time(NULL);
-  desktop_plugin->priv->scene = scene;
-
-  actor = init_object(desktop_plugin, "sky", "sky0.png", 
-                      0, 0, 5, 800, 480, 
-                      TRUE , TRUE, 100, 255, 
-                      (gpointer)&change_static_actor, NULL, 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, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_sun, NULL, NULL);
-  actor->time_start_animation = now;
-  actor->duration_animation = G_MAXINT;
-  change_sun(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  //actor = init_object(desktop_plugin, "dot", "dot1.png", 0, 0, 11, 50, 50, 
-    //                  TRUE, 100, 255, NULL, NULL);
-  //scene.actors = g_slist_append(scene.actors, actor);
-  
-  actor = init_object(desktop_plugin, "cloud1", "cloud1.png", 
-                      0, fast_rnd(300)-97, 7, 150, 97, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_cloud, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(20);
-  actor->duration_animation = 3*60;
-  scene->actors = g_slist_append(scene->actors, actor);
-  
-  actor = init_object(desktop_plugin, "cloud2", "cloud2.png", 
-                      0, fast_rnd(300)-75, 7, 188, 75, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_cloud, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(40)+10;
-  actor->duration_animation = 3*60;
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "cloud4", "cloud4.png", 
-                      0, fast_rnd(300)-75, 7, 150, 75, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_cloud, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(60) + 20;
-  actor->duration_animation = 5*60;
-  scene->actors = g_slist_append(scene->actors, actor);
-
-
-  actor = init_object(desktop_plugin, "town", "town0.png", 
-                      0, 0, 8, 800, 480, 
-                      TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_static_actor, NULL, NULL);
-  change_static_actor(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "stend", "stend0.png", 
-                      482, 146, 9, 300, 305, 
-                      TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_static_actor, NULL, NULL);
-  change_static_actor(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
 
-  actor = init_object(desktop_plugin, "tram", "tram.png", 
-                      -300, 225, 10, 350, 210, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_tram, NULL, NULL);
-  actor->time_start_animation = time(NULL) + fast_rnd(10); 
-  actor->duration_animation = 60;
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "border", "border0.png", 
-                      0, 480-79, 11, 800, 79,
-                      TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_static_actor_with_corner, NULL, NULL);
-  change_static_actor_with_corner(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-  
-  actor = init_object(desktop_plugin, "moon", "moon1.png", 
-                      400, 20, 6, 60, 60, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_moon, NULL, NULL);
-  change_moon(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "wind", "", 
-                      0, 0, 5, 0, 0, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_wind, NULL, NULL);
-  change_wind(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-    /* windows in 4-th house  */
-
-    winds[0][0] = 482;
-    winds[0][1] = 180;
-
-    winds[1][0] = 495;
-    winds[1][1] = 179;
-
-    winds[2][0] = 482;
-    winds[2][1] = 191;
-
-    winds[3][0] = 495;
-    winds[3][1] = 190;
-    
-    winds[4][0] = 482;
-    winds[4][1] = 201;
-    
-    winds[5][0] = 495;
-    winds[5][1] = 210;
-    
-    winds[6][0] = 482;
-    winds[6][1] = 222;
-    
-    winds[7][0] = 495;
-    winds[7][1] = 221;
-    
-    winds[8][0] = 459;
-    winds[8][1] = 203;
-    
-    winds[9][0] = 495;
-    winds[9][1] = 241;
-    
-    winds[10][0] = 495;
-    winds[10][1] = 252;
-    
-    winds[11][0] = 482;
-    winds[11][1] = 273;
-    
-    winds[12][0] = 495;
-    winds[12][1] = 303;
-    for (i=0; i<13; i++){
-        actor = init_object(desktop_plugin, "window1", "window1.png", 
-                            winds[i][0], winds[i][1], 8, 8, 10, 
-                            FALSE, FALSE, 100, 255, 
-                            (gpointer)&change_window1, NULL, NULL);
-        //change_window1(actor, desktop_plugin);
-        actor->time_start_animation = now + fast_rnd(30);
-        scene->actors = g_slist_append(scene->actors, actor);
-
-    }
-    
-    /* windows in 1-th house  */
-    
-    winds[0][0] = 86;
-    winds[0][1] = 321;
-
-    winds[1][0] = 86;
-    winds[1][1] = 363;
-
-    winds[2][0] = 86;
-    winds[2][1] = 385;
-
-    winds[3][0] = 86;
-    winds[3][1] = 286;
-    
-    winds[4][0] = 94;
-    winds[4][1] = 232;
-    
-    winds[5][0] = 94;
-    winds[5][1] = 243;
-    
-    winds[6][0] = 94;
-    winds[6][1] = 265;
-    
-    winds[7][0] = 94;
-    winds[7][1] = 331;
-    for (i=0; i<8; i++){
-        actor = init_object(desktop_plugin, "window2", "window2.png", 
-                            winds[i][0], winds[i][1], 8, 8, 10, 
-                            FALSE, FALSE, 100, 255, 
-                            (gpointer)&change_window1, NULL, NULL);
-        //change_window1(actor, desktop_plugin);
-        actor->time_start_animation = now + fast_rnd(30);
-        scene->actors = g_slist_append(scene->actors, actor);
-
-    }
-    
-    /* windows in 3-th house  */
-    
-    winds[0][0] = 251;
-    winds[0][1] = 162;
-
-    winds[1][0] = 251;
-    winds[1][1] = 196;
-
-    winds[2][0] = 251;
-    winds[2][1] = 278;
-
-    winds[3][0] = 251;
-    winds[3][1] = 289;
-    
-    winds[4][0] = 313;
-    winds[4][1] = 173;
-    
-    winds[5][0] = 322;
-    winds[5][1] = 160;
-    
-    winds[6][0] = 303;
-    winds[6][1] = 217;
-    
-    winds[7][0] = 322;
-    winds[7][1] = 224;
-    
-    winds[8][0] = 323;
-    winds[8][1] = 217;
-    
-    winds[9][0] = 322;
-    winds[9][1] = 288;
-    
-    for (i=0; i<10; i++){
-        actor = init_object(desktop_plugin, "window3", "window3.png", 
-                            winds[i][0], winds[i][1], 8, 8, 10, 
-                            FALSE, FALSE, 100, 255, 
-                            (gpointer)&change_window1, NULL, NULL);
-        //change_window1(actor, desktop_plugin);
-        actor->time_start_animation = now + fast_rnd(30);
-        scene->actors = g_slist_append(scene->actors, actor);
-
-    }
-
-    /* windows in 5-th house  */
-    
-    winds[0][0] = 610;
-    winds[0][1] = 224;
-
-    winds[1][0] = 602;
-    winds[1][1] = 245;
-
-    winds[2][0] = 602;
-    winds[2][1] = 264;
-
-    winds[3][0] = 610;
-    winds[3][1] = 301;
-    
-    winds[4][0] = 610;
-    winds[4][1] = 320;
-    
-    winds[5][0] = 593;
-    winds[5][1] = 352;
-    
-    winds[6][0] = 610;
-    winds[6][1] = 368;
-    
-    for (i=0; i<7; i++){
-        actor = init_object(desktop_plugin, "window4", "window4.png", 
-                            winds[i][0], winds[i][1], 8, 8, 10, 
-                            FALSE, FALSE, 100, 255, 
-                            (gpointer)&change_window1, NULL, NULL);
-        //change_window1(actor, desktop_plugin);
-        actor->time_start_animation = now + fast_rnd(30);
-        scene->actors = g_slist_append(scene->actors, actor);
-
-    }
-
-    /* windows in 6-th house  */
-    
-    winds[0][0] = 717;
-    winds[0][1] = 283;
-
-    winds[1][0] = 698;
-    winds[1][1] = 293;
-
-    winds[2][0] = 717;
-    winds[2][1] = 315;
-
-    winds[3][0] = 717;
-    winds[3][1] = 323;
-    
-    winds[4][0] = 698;
-    winds[4][1] = 362;
-    
-    winds[5][0] = 698;
-    winds[5][1] = 400;
-    
-    for (i=0; i<6; i++){
-        actor = init_object(desktop_plugin, "window5", "window5.png", 
-                            winds[i][0], winds[i][1], 8, 8, 10, 
-                            FALSE, FALSE, 100, 255, 
-                            (gpointer)&change_window1, NULL, NULL);
-        //change_window1(actor, desktop_plugin);
-        actor->time_start_animation = now + fast_rnd(30);
-        scene->actors = g_slist_append(scene->actors, actor);
-
-    }
-    run_long_timeout(desktop_plugin);
-
-#if 0    
-  anim = g_new0(Animation, 1);
-  anim->count = 1;
-  anim->actor = actor;
-  anim->func_change = &change_tram;
-  anim->func_time = NULL;
-  anim->timestart = time(NULL); 
-  anim->timeall = 10;
-  
-  scene.dynamic_actors = g_slist_append(scene.dynamic_actors, anim);
-#endif  
-}
-
-/* Init Berlin Scene */
-static void
-init_scene1(AWallpaperPlugin *desktop_plugin)
-{
-  Actor *actor, *actor1, *actor2;
-  Scene *scene;
-  gint now = time(NULL);
-  gint i; 
-  gint winds[13][2];
-  GPtrArray *child = NULL;
-
-  scene = g_new0(Scene, 1);
-  scene->daytime = get_daytime();
-  scene->actors = NULL;
-  scene->wind_orientation = -1;
-  scene->wind_angle = 0.3;
-  /* init value for random */
-  scene->seed = time(NULL);
-  desktop_plugin->priv->scene = scene;
-  
-  actor = init_object(desktop_plugin, "sky", "sky.png", 0, 0, 5, 800, 480, 
-                      TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_static_actor, NULL, 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, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_sun, NULL, NULL);
-  actor->time_start_animation = time(NULL);
-  actor->duration_animation = G_MAXINT;
-  change_sun(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-#if 0
-  actor = init_object(desktop_plugin, "dot", "dot1.png", 0, 0, 11, 50, 50, 
-                      TRUE, 100, 255, NULL, NULL);
-  scene.actors = g_slist_append(scene.actors, actor);
-#endif
-
-  actor = init_object(desktop_plugin, "moon", "moon1.png", 400, 15, 6, 60, 60, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_moon, NULL, NULL);
-  change_moon(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-  
-  actor = init_object(desktop_plugin, "cloud1", "cloud1.png", 0, fast_rnd(300)-97, 7, 150, 97, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_cloud, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(30) + 10;
-  actor->duration_animation = 3*60;
-  scene->actors = g_slist_append(scene->actors, actor);
-  
-  actor = init_object(desktop_plugin, "cloud2", "cloud2.png", 0, fast_rnd(300)-75, 7, 188, 75, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_cloud, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(10);
-  actor->duration_animation = 3*60;
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "cloud4", "cloud4.png", 0, fast_rnd(300)-75, 7, 150, 75, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_cloud, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(60) + 20;
-  actor->duration_animation = 5*60;
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "plane2", "plane3.png", 0, 45, 8, 160, 50, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_plane2, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(40) + 20;
-  actor->duration_animation = 60;
-  scene->actors = g_slist_append(scene->actors, actor);
-  
-  actor = init_object(desktop_plugin, "plane1", "tu154.png", 620, 233, 9, 300, 116, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_plane1, NULL, NULL);
-  actor->time_start_animation = now + fast_rnd(20);
-  actor->duration_animation = 30;
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "town", "town.png", 0, 0, 10, 800, 480, 
-                      TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_static_actor_with_corner, NULL, NULL);
-  change_static_actor_with_corner(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor = init_object(desktop_plugin, "wind", "", 0, 0, 5, 0, 0, 
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_wind, NULL, NULL);
-  change_wind(actor, desktop_plugin);
-  scene->actors = g_slist_append(scene->actors, actor);
-
-  actor1 = init_object(desktop_plugin, "signal_red", "red.png", 
-                      486, 425, 10, 18, 38, 
-                      FALSE, TRUE, 100, 255, NULL, NULL, NULL);
-  //actor->time_start_animation = now + fast_rnd(30) + 10;  
-  scene->actors = g_slist_append(scene->actors, actor1);
-   
-  actor2 = init_object(desktop_plugin, "signal_green", "green.png", 
-                      486, 425, 10, 18, 38, 
-                      TRUE, TRUE, 100, 255, NULL, NULL, NULL);
-  //actor->time_start_animation = now + fast_rnd(30) + 10;  
-  scene->actors = g_slist_append(scene->actors, actor2);
-  child = g_ptr_array_sized_new(2);
-  g_ptr_array_add(child, actor1);
-  g_ptr_array_add(child, actor2);
-  actor = init_object(desktop_plugin, "signal", "",
-                      486, 425, 10, 18, 38,
-                      FALSE, FALSE, 100, 255, 
-                      (gpointer)&change_signal, NULL, child);
-  actor->time_start_animation = now + fast_rnd(30) + 10;
-  scene->actors = g_slist_append(scene->actors, actor);
-    
-    winds[0][0] = 389;
-    winds[0][1] = 305;
-
-    winds[1][0] = 373;
-    winds[1][1] = 306;
-
-    winds[2][0] = 355;
-    winds[2][1] = 306;
-
-    winds[3][0] = 356;
-    winds[3][1] = 288;
-    
-    winds[4][0] = 337;
-    winds[4][1] = 269;
-    
-    winds[5][0] = 372;
-    winds[5][1] = 268;
-  
-    winds[6][0] = 372;
-    winds[6][1] = 249;
-    
-    winds[7][0] = 388;
-    winds[7][1] = 249;
-    
-    winds[8][0] = 387;
-    winds[8][1] = 230;
-    
-    winds[9][0] = 372;
-    winds[9][1] = 211;
-    
-    winds[10][0] = 355;
-    winds[10][1] = 159;
-    
-    winds[11][0] = 335;
-    winds[11][1] = 158;
-    
-    winds[12][0] = 386;
-    winds[12][1] = 119;
-  
-    for (i=0; i<13; i++){
-        actor = init_object(desktop_plugin, "window", "window.png", 
-                            winds[i][0], winds[i][1], 10, 8, 9, 
-                            FALSE, TRUE, 100, 255, 
-                            (gpointer)&change_window1, NULL, NULL);
-        //change_window1(actor, desktop_plugin);
-        actor->time_start_animation = now + fast_rnd(30);
-        scene->actors = g_slist_append(scene->actors, actor);
-
-    }
-    
-    run_long_timeout(desktop_plugin);
-
-}
-
-void 
-get_sun_screen_pos(double alt, double azm, gint * x, gint * y)
-{
-    gint y0 = 365;// - уровень горизонта
-    *x = (int)(azm * 800) - 64;
-    *y = (int)((1 - alt) * y0) - 64;
-    //fprintf(stderr, "sun pos alt=%f azm=%f x=%d y=%d\n", alt, azm, *x, *y);
-}
-#if 0
-static void 
-change_actor(GtkWidget * actor)
-{
-    char * name;
-    gint x, y, daytime, scale;
-    gdouble sc;
-    double alt, azm;
-
-    GtkWidget *image;
-    GdkPixbuf *pixbuf;
-
-    void (*pfunc)(gpointer, gpointer);
-
-    name = g_object_get_data(G_OBJECT(actor), "name");
-    fprintf(stderr, "change actor %s\n", name);
-    if (name == "sun"){
-        pfunc = g_object_get_data(G_OBJECT(actor), "func");
-        if (pfunc)
-            (*pfunc)(actor, g_strdup(name));
-        daytime = get_daytime();
-        if (daytime != TIME_NIGHT){
-            hildon_animation_actor_set_show(actor, 1);
-            get_sun_pos(&alt, &azm);
-            get_sun_screen_pos(alt, azm, &x, &y);
-            actor_set_position_full(actor, x, y, g_object_get_data(G_OBJECT(actor), "z"));
-        }
-    }
-    
-    if (name == "cloud1"){
-        x = g_object_get_data(G_OBJECT(actor), "x");
-        y = g_object_get_data(G_OBJECT(actor), "y");
-        scale = g_object_get_data(G_OBJECT(actor), "scale");
-
-        /* Start */
-        image = g_object_get_data(G_OBJECT(actor), "image");
-        
-        gtk_container_remove(actor, image);  
-        pixbuf = gdk_pixbuf_new_from_file_at_size ("/usr/share/livewp/theme/Modern/sun.png", 
-                                             200, 
-                                             200, 
-                                             NULL);
-        if (pixbuf){
-              image = gtk_image_new_from_pixbuf (pixbuf);
-              g_object_unref(G_OBJECT(pixbuf));
-        }
-        g_signal_connect(G_OBJECT(image), "expose_event",
-                                   G_CALLBACK(expose_event), pixbuf);
-        gtk_container_add (GTK_CONTAINER (actor), image);
-        realize(actor);
-        gtk_widget_show_all(actor);
-        /* End*/
-
-            
-        x += 40;
-        y -= 20;
-        scale -= 10;
-        if (x > 500){
-            x = 400;
-            y = 150;
-            sc = 1;
-        }
-        sc = (double)scale / 100;
-        hildon_animation_actor_set_scale(actor, sc, sc);
-        fprintf(stderr, "cloud x=%d y=%d scale=%f", x, y, sc);
-        actor_set_position_full(actor, x, y, g_object_get_data(G_OBJECT(actor), "z"));
-        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), "scale", scale);
-    }
-
-}
-#endif
 static gboolean
 short_timeout (AWallpaperPlugin *desktop_plugin)
 {
@@ -1057,12 +415,13 @@ rich_animation_press(GtkWidget *widget, GdkEvent *event,
     fprintf(stderr,"gggggggggggggggggggg2222\n");
     return FALSE;
 }    
+
 static void
 animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
 {
     GtkWidget *rich_animation;
     gchar           buffer[2048];
-
+    gchar str[128];
 
     //fprintf(stderr, "!!!!!!!plugin init \n");
     Animation_WallpaperPrivate *priv =  Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE (desktop_plugin);
@@ -1079,7 +438,14 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     priv->short_timer = 0;
     priv->xapplet = 0;
     priv->yapplet = 0;
-    //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);
+//#endif
+    priv->theme = g_strdup("Modern");
     desktop_plugin->priv->main_widget = gtk_fixed_new();
 
     gtk_widget_set_size_request(desktop_plugin->priv->main_widget, 100, 32);
@@ -1116,13 +482,19 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
 
     
     fprintf(stderr, "!!!theme = %s\n", priv->theme);
+    snprintf(str, sizeof(str) - 1, "%s", "init_scene2");
+    fprintf(stderr, " str = %s\n", str);
     priv->scene = NULL;
+#if 0
     if (!strcmp(priv->theme,"Modern"))
-        init_scene(desktop_plugin);
+        init_scene_Modern(desktop_plugin);
     else if (!strcmp(priv->theme,"Berlin")) 
-        init_scene1(desktop_plugin);
+        init_scene_Berlin(desktop_plugin);
     else if (!strcmp(priv->theme, "Matrix"))
-        init_scene2(desktop_plugin);
+        init_scene_Matrix(desktop_plugin);
+#endif
+    init_scene_theme(desktop_plugin);
+        
     priv->long_timer = g_timeout_add(LONG_TIMER, (GtkFunction)long_timeout, desktop_plugin);
     /* TODO Move scene to priv */
     //scene.timer_type = LONG_TIMER_TYPE;
@@ -1138,7 +510,8 @@ lw_applet_finalize (GObject *object)
 {
      AWallpaperPlugin *desktop_plugin = Animation_Wallpaper_HOME_PLUGIN (object);
      Animation_WallpaperPrivate *priv = desktop_plugin->priv;
-     
+
+     livewp_deinitialize_dbus(priv);
      fprintf(stderr,"finalaze %i\n", priv->long_timer);
      if (priv->long_timer){
         g_source_remove(priv->long_timer);