added into billboard info about missed calls, sms, chat, mail from notifications...

[livewp] / applet / src / livewp-scene.c

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index 914df70..d012083 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -47,17 +47,17 @@ reload_scene(AWallpaperPlugin *desktop_plugin)
     destroy_scene(desktop_plugin);
 #if 0
     if (!strcmp(desktop_plugin->priv->theme,"Modern"))
-        init_scene(desktop_plugin);
+        init_scene_Modern(desktop_plugin);
     else if (!strcmp(desktop_plugin->priv->theme,"Berlin")) 
-        init_scene1(desktop_plugin);
+        init_scene_Berlin(desktop_plugin);
     else if (!strcmp(desktop_plugin->priv->theme,"Matrix")) 
-        init_scene2(desktop_plugin);
+        init_scene_Matrix(desktop_plugin);
 #endif
     init_scene_theme(desktop_plugin);
 }
 
 void
-init_scene2(AWallpaperPlugin *desktop_plugin)
+init_scene_Matrix(AWallpaperPlugin *desktop_plugin)
 {
   Actor *actor;
   Scene *scene;
@@ -142,7 +142,7 @@ init_scene2(AWallpaperPlugin *desktop_plugin)
 
 /* Init Modern Scene */
 void
-init_scene(AWallpaperPlugin *desktop_plugin)
+init_scene_Modern(AWallpaperPlugin *desktop_plugin)
 {
   Actor *actor;
   Scene *scene;
@@ -213,12 +213,21 @@ init_scene(AWallpaperPlugin *desktop_plugin)
   scene->actors = g_slist_append(scene->actors, actor);
 
   actor = init_object(desktop_plugin, "stend", "stend0.png", 
-                      482, 146, 9, 300, 305, 
+                      452, 166, 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, "billboard_text", "",
+                      470, 174, 9, 300, 108,
+                      TRUE, FALSE, 100, 255,
+                      (gpointer)&change_billboard, NULL, NULL);
+  create_hildon_actor_text(actor, desktop_plugin);
+  //actor->time_start_animation = time(NULL) + 20;
+  change_billboard(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, 
@@ -459,7 +468,7 @@ init_scene(AWallpaperPlugin *desktop_plugin)
 
 /* Init Berlin Scene */
 void
-init_scene1(AWallpaperPlugin *desktop_plugin)
+init_scene_Berlin(AWallpaperPlugin *desktop_plugin)
 {
   Actor *actor, *actor1, *actor2;
   Scene *scene;
@@ -630,15 +639,8 @@ init_scene1(AWallpaperPlugin *desktop_plugin)
 void 
 init_scene_theme(AWallpaperPlugin *desktop_plugin)
 {
-    GHashTable * hash;
     void (*func)(gpointer);
-    hash = g_hash_table_new(g_str_hash, g_str_equal);
-    
-    g_hash_table_insert(hash, g_strdup("Berlin"), (gpointer)&init_scene1);
-    g_hash_table_insert(hash, g_strdup("Modern"), (gpointer)&init_scene);
-    g_hash_table_insert(hash, g_strdup("Matrix"), (gpointer)&init_scene2);
-
-    func = g_hash_table_lookup(hash, desktop_plugin->priv->theme);
+    func = g_hash_table_lookup(desktop_plugin->priv->hash_scene_func, desktop_plugin->priv->theme);
     if (func){
         (*func)(desktop_plugin);
     }