From 962dba8d491e3374bf5d86a606041d1fc19d6150 Mon Sep 17 00:00:00 2001 From: tanya Date: Sun, 25 Apr 2010 13:44:20 +0300 Subject: [PATCH] some little changes --- applet/src/livewp-common.h | 2 +- applet/src/livewp-home-widget.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/applet/src/livewp-common.h b/applet/src/livewp-common.h index 53bbecc..e45bafa 100644 --- a/applet/src/livewp-common.h +++ b/applet/src/livewp-common.h @@ -40,7 +40,7 @@ #define THEME_PATH "/usr/share/livewp/theme" #define SHORT_TIMER 75 /* 100 milisecond */ //#define LONG_TIMER 5*60*1000 /* 10 minutes */ -#define LONG_TIMER 10*1000 /* 10 minutes */ +#define LONG_TIMER 20*1000 /* 10 minutes */ enum { SHORT_TIMER_TYPE, LONG_TIMER_TYPE }; #define SKY_LEVEL 0 #define SUN_LEVEL 0 diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c index 96a3077..e8ede24 100644 --- a/applet/src/livewp-home-widget.c +++ b/applet/src/livewp-home-widget.c @@ -252,8 +252,8 @@ probability_sun() gint probability_plane() { - return (fast_rnd(10) + 1) * 60; -// return 0; + //return (fast_rnd(10) + 1) * 60; + return fast_rnd(180); } void @@ -1280,21 +1280,21 @@ init_scene1(AWallpaperPlugin *desktop_plugin) 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(180); + 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(180); + 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(180); + actor->time_start_animation = now + fast_rnd(60) + 20; actor->duration_animation = 5*60; scene.actors = g_slist_append(scene.actors, actor); @@ -1302,14 +1302,14 @@ init_scene1(AWallpaperPlugin *desktop_plugin) 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 + probability_plane(); + 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 + probability_plane(); + actor->time_start_animation = now + fast_rnd(20); actor->duration_animation = 30; scene.actors = g_slist_append(scene.actors, actor); @@ -1637,7 +1637,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin) priv->desktop_plugin = desktop_plugin; priv->visible = TRUE; priv->short_timer = 0; - priv->theme = g_strdup("Modern"); + //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); -- 1.7.9.5