continued restructuring

diff --git a/applet/src/livewp-actor.c b/applet/src/livewp-actor.c
index 1a35526..1cc6636 100644 (file)
--- a/applet/src/livewp-actor.c
+++ b/applet/src/livewp-actor.c
@@ -90,7 +90,7 @@ path_line(gint x0, gint x1, double t)
     // уравниение прямой
     return ((x1 - x0) * t + x0);
 }
-static void
+void
 set_actor_scale(Actor *actor, double scalex, double scaley)
 {
     hildon_animation_actor_set_scale(
@@ -101,7 +101,7 @@ set_actor_scale(Actor *actor, double scalex, double scaley)
 
 }
 
-static void 
+void 
 set_actor_visible(Actor *actor, gboolean visible)
 {
     hildon_animation_actor_set_show(HILDON_ANIMATION_ACTOR(actor->widget), visible);
@@ -491,4 +491,31 @@ change_layer(Actor * actor, AWallpaperPlugin *desktop_plugin)
     a->y = y;
 }
 
+void 
+change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gchar *newfile;
+    newfile = g_strdup_printf("%s%d.png", actor->name, desktop_plugin->priv->scene->daytime); 
+    if (actor->filename)
+            g_free(actor->filename);
+    actor->filename = newfile;
+    change_hildon_actor(actor, desktop_plugin);
+}
+
+void 
+change_static_actor_with_corner(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gchar buffer[2048];
+
+    if (desktop_plugin->priv->right_corner)
+        gtk_widget_destroy(desktop_plugin->priv->right_corner);
+    snprintf(buffer, sizeof(buffer) - 1, "%s/%s/town%i_right_corner.png", \
+                                  THEME_PATH, desktop_plugin->priv->theme, desktop_plugin->priv->scene->daytime);
+    desktop_plugin->priv->right_corner = gtk_image_new_from_file (buffer);
+    if (desktop_plugin->priv->right_corner){
+        gtk_fixed_put(GTK_FIXED(desktop_plugin->priv->main_widget), desktop_plugin->priv->right_corner, 0, 0);
+        gtk_widget_show (desktop_plugin->priv->right_corner);
+    }
+    change_static_actor(actor, desktop_plugin);
 
+}

diff --git a/applet/src/livewp-actor.h b/applet/src/livewp-actor.h
index 05c3124..c1c715d 100644 (file)
--- a/applet/src/livewp-actor.h
+++ b/applet/src/livewp-actor.h
@@ -46,6 +46,8 @@ Actor* init_object(AWallpaperPlugin *desktop_plugin,
            );
 void destroy_actor(Actor *actor);
 void set_actor_position(Actor *actor, gint x, gint y, gint z, AWallpaperPlugin *desktop_plugin);
+void set_actor_scale(Actor *actor, double scalex, double scaley);
+void set_actor_visible(Actor *actor, gboolean visible);
 void change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin);
 void change_sun(Actor * actor, AWallpaperPlugin *desktop_plugin);
 void change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin);
@@ -56,4 +58,6 @@ void change_wind(Actor *actor, AWallpaperPlugin *desktop_plugin);
 void change_window1(Actor * actor, AWallpaperPlugin *desktop_plugin);
 void change_signal(Actor * actor, AWallpaperPlugin *desktop_plugin);
 void change_layer(Actor * actor, AWallpaperPlugin *desktop_plugin);
+void change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin);
+void change_static_actor_with_corner(Actor * actor, AWallpaperPlugin *desktop_plugin);
 #endif

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index f12baa2..fc193c8 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -214,10 +214,10 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
     gtk_container_add (GTK_CONTAINER (ha), image);
   }  
   //actor_set_position_full(ha, actor->x, actor->y, actor->z);
-  hildon_animation_actor_set_scale(HILDON_ANIMATION_ACTOR(ha), (double)actor->scale/100, (double)actor->scale/100);
+  //hildon_animation_actor_set_scale(HILDON_ANIMATION_ACTOR(ha), (double)actor->scale/100, (double)actor->scale/100);
   realize(ha);
   gtk_widget_show_all(ha);
-  hildon_animation_actor_set_show (HILDON_ANIMATION_ACTOR(ha), actor->visible);
+  //hildon_animation_actor_set_show (HILDON_ANIMATION_ACTOR(ha), actor->visible);
   
   /* TO DO check it */
   /*  gdk_flush (); */
@@ -226,6 +226,8 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
   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);
 }
 
 
@@ -268,34 +270,6 @@ change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
 }
 
 
-void 
-change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin)
-{
-    gchar *newfile;
-    newfile = g_strdup_printf("%s%d.png", actor->name, desktop_plugin->priv->scene->daytime); 
-    if (actor->filename)
-            g_free(actor->filename);
-    actor->filename = newfile;
-    change_hildon_actor(actor, desktop_plugin);
-}
-
-void 
-change_static_actor_with_corner(Actor * actor, AWallpaperPlugin *desktop_plugin)
-{
-    gchar buffer[2048];
-
-    if (desktop_plugin->priv->right_corner)
-        gtk_widget_destroy(desktop_plugin->priv->right_corner);
-    snprintf(buffer, sizeof(buffer) - 1, "%s/%s/town%i_right_corner.png", \
-                                  THEME_PATH, desktop_plugin->priv->theme, desktop_plugin->priv->scene->daytime);
-    desktop_plugin->priv->right_corner = gtk_image_new_from_file (buffer);
-    if (desktop_plugin->priv->right_corner){
-        gtk_fixed_put(GTK_FIXED(desktop_plugin->priv->main_widget), desktop_plugin->priv->right_corner, 0, 0);
-        gtk_widget_show (desktop_plugin->priv->right_corner);
-    }
-    change_static_actor(actor, desktop_plugin);
-
-}
 
 /*
 static gint