From: tanya <tanya@moshkanov.oblgaz>
Date: Thu, 2 Sep 2010 19:50:37 +0000 (+0300)
Subject: redesigned fifteen
X-Git-Url: http://git.maemo.org/git/?p=livewp;a=commitdiff_plain;h=1d8a2497850de26700d69e21b7ad962aaa9d9476

redesigned fifteen
---

diff --git a/applet/data/external_themes/fifteen.xml b/applet/data/external_themes/fifteen.xml
new file mode 100644
index 0000000..c1b34c5
--- /dev/null
+++ b/applet/data/external_themes/fifteen.xml
@@ -0,0 +1,8 @@
+<theme>
+<name>Fifteen</name>
+ <exec_path>/usr/bin/fifteen</exec_path>
+ <window_name>fifteen</window_name>
+ <category>Unknown</category>
+ <icon_on>/usr/share/livewp/external_icons/xscreensaver.png</icon_on>
+ <icon_off>/usr/share/livewp/external_icons/xscreensaverd.png</icon_off>
+</theme>
diff --git a/applet/data/theme/Fifteen/1.png b/applet/data/theme/Fifteen/1.png
index 32d6dee..982b665 100644
Binary files a/applet/data/theme/Fifteen/1.png and b/applet/data/theme/Fifteen/1.png differ
diff --git a/applet/data/theme/Fifteen/10.png b/applet/data/theme/Fifteen/10.png
index 8df8731..c5b7ad1 100644
Binary files a/applet/data/theme/Fifteen/10.png and b/applet/data/theme/Fifteen/10.png differ
diff --git a/applet/data/theme/Fifteen/11.png b/applet/data/theme/Fifteen/11.png
index 03b39e4..ea22503 100644
Binary files a/applet/data/theme/Fifteen/11.png and b/applet/data/theme/Fifteen/11.png differ
diff --git a/applet/data/theme/Fifteen/12.png b/applet/data/theme/Fifteen/12.png
index bf582fb..2151c04 100644
Binary files a/applet/data/theme/Fifteen/12.png and b/applet/data/theme/Fifteen/12.png differ
diff --git a/applet/data/theme/Fifteen/13.png b/applet/data/theme/Fifteen/13.png
index a609884..0125718 100644
Binary files a/applet/data/theme/Fifteen/13.png and b/applet/data/theme/Fifteen/13.png differ
diff --git a/applet/data/theme/Fifteen/14.png b/applet/data/theme/Fifteen/14.png
index 8643809..5273a30 100644
Binary files a/applet/data/theme/Fifteen/14.png and b/applet/data/theme/Fifteen/14.png differ
diff --git a/applet/data/theme/Fifteen/15.png b/applet/data/theme/Fifteen/15.png
index 3a41a85..3f213ab 100644
Binary files a/applet/data/theme/Fifteen/15.png and b/applet/data/theme/Fifteen/15.png differ
diff --git a/applet/data/theme/Fifteen/2.png b/applet/data/theme/Fifteen/2.png
index 98ef6cb..e616053 100644
Binary files a/applet/data/theme/Fifteen/2.png and b/applet/data/theme/Fifteen/2.png differ
diff --git a/applet/data/theme/Fifteen/3.png b/applet/data/theme/Fifteen/3.png
index f6d8a93..9647fd1 100644
Binary files a/applet/data/theme/Fifteen/3.png and b/applet/data/theme/Fifteen/3.png differ
diff --git a/applet/data/theme/Fifteen/4.png b/applet/data/theme/Fifteen/4.png
index 1ba9e2b..d94746a 100644
Binary files a/applet/data/theme/Fifteen/4.png and b/applet/data/theme/Fifteen/4.png differ
diff --git a/applet/data/theme/Fifteen/5.png b/applet/data/theme/Fifteen/5.png
index 19e0da5..1678ecf 100644
Binary files a/applet/data/theme/Fifteen/5.png and b/applet/data/theme/Fifteen/5.png differ
diff --git a/applet/data/theme/Fifteen/6.png b/applet/data/theme/Fifteen/6.png
index 9749f61..a7f2b77 100644
Binary files a/applet/data/theme/Fifteen/6.png and b/applet/data/theme/Fifteen/6.png differ
diff --git a/applet/data/theme/Fifteen/7.png b/applet/data/theme/Fifteen/7.png
index bee766e..e03be24 100644
Binary files a/applet/data/theme/Fifteen/7.png and b/applet/data/theme/Fifteen/7.png differ
diff --git a/applet/data/theme/Fifteen/8.png b/applet/data/theme/Fifteen/8.png
index adfe4a1..4a48b78 100644
Binary files a/applet/data/theme/Fifteen/8.png and b/applet/data/theme/Fifteen/8.png differ
diff --git a/applet/data/theme/Fifteen/9.png b/applet/data/theme/Fifteen/9.png
index b0657bf..b97db5f 100644
Binary files a/applet/data/theme/Fifteen/9.png and b/applet/data/theme/Fifteen/9.png differ
diff --git a/applet/src/fifteen.c b/applet/src/fifteen.c
index 32fc434..58219c7 100644
--- a/applet/src/fifteen.c
+++ b/applet/src/fifteen.c
@@ -12,8 +12,8 @@ enum {
     LEFT = 3
 };
 
-const gint width = 200;
-const gint height = 120;
+const gint width = 110;
+const gint height = 110;
 
 typedef struct _Scene1 Scene1;
 struct _Scene1 
@@ -164,7 +164,11 @@ gboolean main_timer(AWallpaperPlugin *desktop_plugin)
 void init_actors(AWallpaperPlugin *desktop_plugin)
 {
     gint i;
-    //Actor *actors[15];
+    Actor *actor;
+    actor = init_object(desktop_plugin, "background", g_strdup("background.jpg"),
+                                -180, -10, 2, 800, 480,
+                                TRUE, TRUE, 100, 255,
+                                NULL, NULL, NULL);
     for (i=0; i<15; i++){
         actors[i] = init_object(desktop_plugin, "bone", g_strdup_printf("%d.png", i+1),
                                 0, 0, 2, width, height,
@@ -217,16 +221,15 @@ int main( int   argc, char *argv[] )
     fprintf(stderr, "view=%d window_id=%d\n", view, window_id);
 
     hildon_gtk_init (&argc, &argv);
-    g_set_application_name ("Simplest example");
+    g_set_application_name ("Fifteen");
     window = hildon_window_new ();
-    fprintf(stderr,"lllllllllllllllll\n");
     //window->window = window_id;
     g_signal_connect (G_OBJECT (window), "delete_event",
                         G_CALLBACK (gtk_main_quit), NULL);
     priv->window = window;
     priv->theme = g_strdup("Fifteen"); 
-    priv->xapplet = 0;
-    priv->yapplet = 0;
+    priv->xapplet = -180;
+    priv->yapplet = -10;
     priv->desktop_plugin = desktop_plugin;
     priv->view = view;
     desktop_plugin->priv = priv;