added themes

diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am
index 1128aa1..c88cf00 100644 (file)
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@ -19,7 +19,9 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
  
-awallpaperdir = $(datadir)/anwall
-awallpaper_DATA = sky.png sun.png town.png cloud1.png sky_dark.png
-EXTRA_DIST = $(awallpaper_DATA) 
+berlinthemedir = $(datadir)/livewp/theme/Berlin
+berlintheme_DATA = theme/Berlin/* 
 
+modernthemedir = $(datadir)/livewp/theme/Modern
+moderntheme_DATA = theme/Modern/*  
+EXTRA_DIST = $(berlintheme_DATA) $(moderntheme_DATA) 

diff --git a/applet/data/background.png b/applet/data/background.png
deleted file mode 100644 (file)
index c20771e..0000000
Binary files a/applet/data/background.png and /dev/null differ

diff --git a/applet/data/cloud1.png b/applet/data/cloud1.png
deleted file mode 100644 (file)
index 7b82062..0000000
Binary files a/applet/data/cloud1.png and /dev/null differ

diff --git a/applet/data/new/border.png b/applet/data/new/border.png
deleted file mode 100644 (file)
index 9eeb5f2..0000000
Binary files a/applet/data/new/border.png and /dev/null differ

diff --git a/applet/data/new/sky.png b/applet/data/new/sky.png
deleted file mode 100644 (file)
index 0c409c7..0000000
Binary files a/applet/data/new/sky.png and /dev/null differ

diff --git a/applet/data/new/stend.png b/applet/data/new/stend.png
deleted file mode 100644 (file)
index 0844c7e..0000000
Binary files a/applet/data/new/stend.png and /dev/null differ

diff --git a/applet/data/new/sun.png b/applet/data/new/sun.png
deleted file mode 100644 (file)
index 10931cd..0000000
Binary files a/applet/data/new/sun.png and /dev/null differ

diff --git a/applet/data/new/town.png b/applet/data/new/town.png
deleted file mode 100644 (file)
index 7683143..0000000
Binary files a/applet/data/new/town.png and /dev/null differ

diff --git a/applet/data/new/tram.png b/applet/data/new/tram.png
deleted file mode 100644 (file)
index 239cbea..0000000
Binary files a/applet/data/new/tram.png and /dev/null differ

diff --git a/applet/data/sky.png b/applet/data/sky.png
deleted file mode 100644 (file)
index bb34906..0000000
Binary files a/applet/data/sky.png and /dev/null differ

diff --git a/applet/data/sky_dark.png b/applet/data/sky_dark.png
deleted file mode 100644 (file)
index 3af5242..0000000
Binary files a/applet/data/sky_dark.png and /dev/null differ

diff --git a/applet/data/sun.png b/applet/data/sun.png
deleted file mode 100644 (file)
index 10931cd..0000000
Binary files a/applet/data/sun.png and /dev/null differ

diff --git a/applet/data/theme/Berlin/background.png b/applet/data/theme/Berlin/background.png
new file mode 100644 (file)
index 0000000..c20771e
Binary files /dev/null and b/applet/data/theme/Berlin/background.png differ

diff --git a/applet/data/theme/Berlin/cloud1.png b/applet/data/theme/Berlin/cloud1.png
new file mode 100644 (file)
index 0000000..7b82062
Binary files /dev/null and b/applet/data/theme/Berlin/cloud1.png differ

diff --git a/applet/data/theme/Berlin/sky.png b/applet/data/theme/Berlin/sky.png
new file mode 100644 (file)
index 0000000..bb34906
Binary files /dev/null and b/applet/data/theme/Berlin/sky.png differ

diff --git a/applet/data/theme/Berlin/sky_dark.png b/applet/data/theme/Berlin/sky_dark.png
new file mode 100644 (file)
index 0000000..3af5242
Binary files /dev/null and b/applet/data/theme/Berlin/sky_dark.png differ

diff --git a/applet/data/theme/Berlin/sun.png b/applet/data/theme/Berlin/sun.png
new file mode 100644 (file)
index 0000000..10931cd
Binary files /dev/null and b/applet/data/theme/Berlin/sun.png differ

diff --git a/applet/data/theme/Berlin/town.png b/applet/data/theme/Berlin/town.png
new file mode 100644 (file)
index 0000000..7e81cd4
Binary files /dev/null and b/applet/data/theme/Berlin/town.png differ

diff --git a/applet/data/theme/Modern/border.png b/applet/data/theme/Modern/border.png
new file mode 100644 (file)
index 0000000..9eeb5f2
Binary files /dev/null and b/applet/data/theme/Modern/border.png differ

diff --git a/applet/data/theme/Modern/sky.png b/applet/data/theme/Modern/sky.png
new file mode 100644 (file)
index 0000000..0c409c7
Binary files /dev/null and b/applet/data/theme/Modern/sky.png differ

diff --git a/applet/data/theme/Modern/stend.png b/applet/data/theme/Modern/stend.png
new file mode 100644 (file)
index 0000000..0844c7e
Binary files /dev/null and b/applet/data/theme/Modern/stend.png differ

diff --git a/applet/data/theme/Modern/sun.png b/applet/data/theme/Modern/sun.png
new file mode 100644 (file)
index 0000000..10931cd
Binary files /dev/null and b/applet/data/theme/Modern/sun.png differ

diff --git a/applet/data/theme/Modern/town.png b/applet/data/theme/Modern/town.png
new file mode 100644 (file)
index 0000000..7683143
Binary files /dev/null and b/applet/data/theme/Modern/town.png differ

diff --git a/applet/data/theme/Modern/tram.png b/applet/data/theme/Modern/tram.png
new file mode 100644 (file)
index 0000000..239cbea
Binary files /dev/null and b/applet/data/theme/Modern/tram.png differ

diff --git a/applet/data/town.png b/applet/data/town.png
deleted file mode 100644 (file)
index 7e81cd4..0000000
Binary files a/applet/data/town.png and /dev/null differ

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 76533f3..ecd83e0 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -164,7 +164,7 @@ init_object(gchar * name, gchar * filename, gint x, gint y, gint z, gint width,
 
   actor = hildon_animation_actor_new();
   gchar str[256];
-  snprintf(str, 255, "/usr/share/anwall/%s", filename);
+  snprintf(str, 255, "/usr/share/livewp/theme/Modern/%s", filename);
   //fprintf(stderr, "!!!init object !!!!\nname = %s file = %s\n", name, str);
   pixbuf = gdk_pixbuf_new_from_file_at_size (str, 
                                              width, 
@@ -300,21 +300,21 @@ init_scene(GtkWidget *window)
 
   get_sun_pos(&alt, &azm);
   get_sun_screen_pos(alt, azm, &x, &y);
-  actor = init_object("sun", "new/sun.png", x, y, 11, 88, 88, 1, 100, 255, &change_sun);
+  actor = init_object("sun", "sun.png", x, y, 11, 88, 88, 1, 100, 255, &change_sun);
   //scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
   //ma1->multiactor_init("sun", g_slist_append(list, G_OBJECT(actor)));
 
-  actor = init_object("sky", "new/sky.png", 0, 0, 5, 800, 480, 1, 100, 255, NULL);
+  actor = init_object("sky", "sky.png", 0, 0, 5, 800, 480, 1, 100, 255, NULL);
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
 
-  actor = init_object("town", "new/town.png", 0, 480-374, 10, 800, 374, 1, 100, 255, NULL);
+  actor = init_object("town", "town.png", 0, 480-374, 10, 800, 374, 1, 100, 255, NULL);
   scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
   
-  actor = init_object("border", "new/border.png", 0, 480-79, 30, 800, 79, 1, 100, 255, NULL);
+  actor = init_object("border", "border.png", 0, 480-79, 30, 800, 79, 1, 100, 255, NULL);
   scene.static_actors = g_slist_append(scene.static_actors, G_OBJECT(actor));
   
-  actor = init_object("tram", "new/tram.png", -350, 60+480-374+34, 25, 350, 274, 1, 100, 255, &change_tram);
+  actor = init_object("tram", "tram.png", -350, 60+480-374+34, 25, 350, 274, 1, 100, 255, &change_tram);
   scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
   
 /*
@@ -445,7 +445,7 @@ change_actor(GtkWidget * actor)
         image = g_object_get_data(G_OBJECT(actor), "image");
         
         gtk_container_remove(actor, image);  
-        pixbuf = gdk_pixbuf_new_from_file_at_size ("/usr/share/anwall/sun.png", 
+        pixbuf = gdk_pixbuf_new_from_file_at_size ("/usr/share/livewp/theme/Modern/sun.png", 
                                              200, 
                                              200, 
                                              NULL);