added semaphore, windows in Berlin

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index 8ae5aa8..c4d7c24 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -124,12 +124,14 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -141,6 +143,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
@@ -153,7 +156,6 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
 NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@

diff --git a/applet/data/theme/Berlin/green.png b/applet/data/theme/Berlin/green.png
index 7a839f9..06d89df 100644 (file)
Binary files a/applet/data/theme/Berlin/green.png and b/applet/data/theme/Berlin/green.png differ

diff --git a/applet/data/theme/Berlin/red.png b/applet/data/theme/Berlin/red.png
index c8eb5f8..2b5d356 100644 (file)
Binary files a/applet/data/theme/Berlin/red.png and b/applet/data/theme/Berlin/red.png differ

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index be6abd6..643d9ee 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -522,7 +522,6 @@ change_window1(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
     
     gint now = time(NULL);
-
     if (scene.daytime == TIME_DAY){
         if (actor->visible){
             actor->visible = FALSE;
@@ -547,6 +546,22 @@ change_window1(Actor * actor, AWallpaperPlugin *desktop_plugin)
    
 }
 
+void 
+change_signal(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gchar *newfile;
+    gint now = time(NULL);
+    newfile = g_strdup_printf("%s%d.png", actor->name, scene.daytime); 
+    if (!strcmp(actor->filename, "red.png"))
+        newfile = g_strdup_printf("%s", "green.png");
+    else 
+        newfile = g_strdup_printf("%s", "red.png");
+    g_free(actor->filename);
+    actor->filename = newfile;
+    change_hildon_actor(actor, desktop_plugin);
+    actor->time_start_animation = now + fast_rnd(30) + 10;
+}
+
 void
 create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin) 
 {
@@ -719,6 +734,7 @@ init_scene(AWallpaperPlugin *desktop_plugin)
   Actor *actor;
   gint now = time(NULL);
   gint i;
+  gint winds[13][2];
 
   /* fprintf(stderr, "init scene \n");*/
   scene.daytime = get_daytime();
@@ -792,7 +808,6 @@ init_scene(AWallpaperPlugin *desktop_plugin)
   scene.actors = g_slist_append(scene.actors, actor);
 
     /* windows in 4-th house  */
-    gint winds[13][2];
 
     winds[0][0] = 482;
     winds[0][1] = 180;
@@ -1001,7 +1016,8 @@ init_scene1(AWallpaperPlugin *desktop_plugin)
 {
   Actor *actor;
   gint now = time(NULL);
-  
+  gint i; 
+  gint winds[13][2];
 
   scene.daytime = get_daytime();
   scene.actors = NULL;
@@ -1076,6 +1092,60 @@ init_scene1(AWallpaperPlugin *desktop_plugin)
   change_wind(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
+  actor = init_object(desktop_plugin, "signal", "red.png", 486, 425, 10, 18, 38, 
+                      TRUE, 100, 255, (gpointer)&change_signal, NULL);
+  actor->time_start_animation = now + fast_rnd(30) + 10;  
+  scene.actors = g_slist_append(scene.actors, actor);winds[0][0] = 717;
+    
+    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, 100, 255, (gpointer)&change_window1, NULL);
+        //change_window1(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(30);
+        scene.actors = g_slist_append(scene.actors, actor);
+
+    }
+
 }