X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=applet%2Fsrc%2Flivewp-settings.c;h=b81e10788f6f2ca0157c5b5053238318abd673cf;hb=67ad3fe0e3a8715d861279e5da8a35806aab124c;hp=06c2dd2d366dad25d557851473bd90d976f728df;hpb=93810fdaebb7aafd154a65a72f2d941c2990bda2;p=livewp

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index 06c2dd2..b81e107 100644
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -7,8 +7,8 @@
  *       for the code
  * 
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful, but
@@ -25,7 +25,8 @@
 #include "livewp-settings.h"
 /*******************************************************************************/
 void lw_about(void){
-
+    
+    gchar *about_string;
     GtkWidget *window = NULL,
     *vbox = NULL,
     *label_about = NULL;
@@ -34,15 +35,18 @@ void lw_about(void){
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     vbox = gtk_vbox_new (FALSE, 5);
-    label_about = gtk_label_new (_("Live Wallpaper Version 0.7 \n Copyright(c) 2010\n \
+    about_string = g_strdup_printf(_("Live Wallpaper Version %s \n Copyright(c) 2010\n \
 Tanya Makova\n Vlad Vasiliev\n \
-Copyright(c) 2010 for design themes Berlin and Modern Vasya Bobrikov\n \
-Copyright(c) 2010 for design theme Matrix Andrew Zhilin\n \
+Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n \
+Copyright(c) 2010 for design themes Matrix Fifteen and for icons Andrew Zhilin\n \
 Translators:\n \
 Finnish - Marko Vertainen\n \
 Spain  - Alejandro López\n \
+Italian  - Emanuele Cassioli\n \
 Russian - Tanya Makova \n \
-          Vlad Vasiliev\n")); 
+          Vlad Vasiliev\n"), VERSION);
+
+    label_about = gtk_label_new (about_string);
     gtk_box_pack_start (GTK_BOX (vbox), label_about, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
                                    vbox, TRUE, TRUE, 0);
@@ -54,68 +58,155 @@ Russian - Tanya Makova \n \
 }
 /*******************************************************************************/
 GtkWidget *
-create_theme_selector (void){
-      GtkWidget *selector;
+create_category_selector (Animation_WallpaperPrivate *priv){
+    GtkWidget *selector;
+    GSList *store = priv->extheme_list;
+    GList *category_list;
+    GHashTable *result_table = NULL;
+
+    selector = hildon_touch_selector_new_text();
+
+    hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "LiveWallpaper" );
+
+    result_table = g_hash_table_new(g_str_hash, g_str_equal);
+    while (store){  
+        if (!g_hash_table_lookup(result_table, g_hash_table_lookup(store->data, "category"))){
+            g_hash_table_insert(result_table, g_hash_table_lookup(store->data, "category"), (gint *)1);     
+            hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), g_hash_table_lookup(store->data, "category"));
+        }
+        store = g_slist_next(store);
+    }
+    
+    /* Add Xscreensaver for install message */
+    if (!g_hash_table_lookup(result_table,"Xscreensaver")){
+            g_hash_table_insert(result_table, "Xscreensaver", (gint *)1);
+            hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Xscreensaver");
+    }
+#if 0
 
-      selector = hildon_touch_selector_new_text ();
+    category_list = g_hash_table_get_keys (result_table);
+    selector = hildon_touch_selector_new_text();
 
-      hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Berlin"));
-      hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Modern"));
-      hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Matrix"));
-      hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Accel"));
-      hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Video"));
-      return selector;
+    hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "LiveWallpaper" );
+    while (category_list){  
+        hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector),category_list->data );
+        fprintf(stderr, "create %s\n", category_list->data);
+        category_list = g_list_next(category_list);
+    }
+#endif
+    return selector;
 }
+
 /*******************************************************************************/
 void
-theme_button_clicked(GtkButton *button, Animation_WallpaperPrivate *priv){
-
+theme_button_clicked(GtkWidget *button, GdkEventButton *event, Animation_WallpaperPrivate *priv){
     lw_theme_settings(GTK_WIDGET(button), priv);
 }
 /********************************************************************************/
 void
-set_button_image(GtkWidget * button, gchar *theme, gboolean enable){
+set_button_image(GtkWidget * button, Animation_WallpaperPrivate *priv, gboolean enable){
     GtkWidget * image = NULL; 
     GdkPixbuf * pixbuf = NULL;
     gchar *str = NULL;
-    if (enable)
-        str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
-                        theme, "icon.png");
-    else 
-        str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
-                        theme, "icond.png");
+    gchar *icon_on = NULL;
+    gchar *icon_off = NULL;
+    GSList *store = priv->extheme_list;
+
+    while (store){
+        if (!strcmp(priv->theme, g_hash_table_lookup(store->data, "name"))){
+            icon_on = g_strdup(g_hash_table_lookup(store->data, "icon_on"));
+            icon_off = g_strdup(g_hash_table_lookup(store->data, "icon_off"));
+            break;
+        }
+        store = (GSList *)g_list_next(store);
+    }
+    if (enable){
+        if (icon_on)
+            str = g_strdup_printf("%s", icon_on);
+        else 
+            str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
+                            priv->theme, "icon.png");
+            if (access(str, F_OK) != 0){
+                g_free(str);
+                str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
+                            "Video", "icon.png");
+            }
+
+    }else {
+        if (icon_off)
+            str = g_strdup_printf("%s", icon_off);
+        else 
+            str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
+                            priv->theme, "icond.png");
+            if (access(str, F_OK) != 0){
+                g_free(str);
+                str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
+                            "Video", "icond.png");
+            }
+    }
     pixbuf = gdk_pixbuf_new_from_file_at_size (str, 
-                                             100, 
-                                             60, 
-                                             NULL);
+                                                 124, 
+                                                 79, 
+                                                 NULL);
     if (str)
         g_free(str);
+    if (icon_on)
+        g_free(icon_on);
+    if (icon_off)
+        g_free(icon_off);
     if (pixbuf){
         image = gtk_image_new_from_pixbuf (pixbuf);
         g_object_unref(G_OBJECT(pixbuf));
     }
 
-   hildon_button_set_image (HILDON_BUTTON (button), image);
+    //hildon_button_set_image (HILDON_BUTTON (button), image);
+    GList *list = gtk_container_get_children(GTK_CONTAINER (button));
+    if (list){
+        gtk_container_remove(GTK_CONTAINER (button), list->data);
+    }
+    gtk_container_add(GTK_CONTAINER (button), image);
+    gtk_widget_show(image);
+    gtk_widget_show(button);
+
 }
 /********************************************************************************/
 GtkWidget *
 create_image_button (gint view, DBusConnection *conn_sess){
-    GtkWidget *button;
-    
+    GtkWidget *event_box;
+
     Animation_WallpaperPrivate *priv = g_new0(Animation_WallpaperPrivate, 1);
+    /* Add external themes to priv */
+    priv->extheme_list = get_list_exthemes();
+
     priv->view = view;
     priv->theme_string_parametr1 = NULL;
     priv->dbus_conn_session = conn_sess;
     read_config(priv);
+
+    event_box = gtk_event_box_new();
+    g_object_set_data(G_OBJECT(event_box), "view", GINT_TO_POINTER(view));
+    g_object_set_data(G_OBJECT(event_box), "priv", priv);
+    set_button_image(event_box, priv, check_applet_state(view));
+    g_signal_connect(G_OBJECT (event_box), "button_press_event", G_CALLBACK(theme_button_clicked), priv);
+    return event_box;
+#if 0
     button = hildon_button_new(HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL);
     g_object_set_data(G_OBJECT(button), "view", GINT_TO_POINTER(view));
     g_object_set_data(G_OBJECT(button), "priv", priv);
-    set_button_image(button, priv->theme, check_applet_state(view));
+    set_button_image(button, priv, check_applet_state(view));
     g_signal_connect(button, "clicked", G_CALLBACK(theme_button_clicked), priv);
     hildon_button_set_image_position (HILDON_BUTTON (button), GTK_POS_RIGHT);
     return button;
-
+#endif
+}
+/********************************************************************************/
+void
+changed_value_one_in_all_cb (GtkWidget *toggle, Animation_WallpaperPrivate *priv)
+{
+    priv->one_in_all_view = hildon_check_button_get_active((HildonCheckButton *)toggle);
+    create_themes_buttons_hbox(priv);
+    fprintf(stderr, "changed_value_one_in_all_cb\n");
 }
 /********************************************************************************/
 void
@@ -123,78 +214,218 @@ changed_value_theme_cb (HildonPickerButton *picker, Animation_WallpaperPrivate *
 {
     const gchar *choice = hildon_button_get_value(HILDON_BUTTON (picker));
     GtkWidget *vbox = NULL;
+    GtkWidget *area_vbox = NULL;
         
+    area_vbox = g_object_get_data(G_OBJECT(priv->window), "area_vbox");
+    if (!area_vbox)
+        return;
     vbox = g_object_get_data(G_OBJECT(priv->window), "custom_vbox");
-    if (vbox)
+    if (vbox){
         gtk_widget_destroy(vbox);
-    vbox = gtk_vbox_new (FALSE, 5);
+    }
+    vbox = gtk_vbox_new (TRUE, 5);
     g_object_set_data(G_OBJECT(priv->window), "custom_vbox", vbox);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(priv->window)->vbox),
-                                   vbox, TRUE, TRUE, 5);
+    gtk_box_pack_start(GTK_BOX(area_vbox),
+                                   vbox, FALSE, FALSE, 5);
     if (choice) {
-        if (!strcmp(choice, "Berlin")){
+        if (!strcmp(choice, _("Berlin"))){
             rich_animation_additional_parametr(vbox,priv);
         }
-        if (!strcmp(choice, "Modern")){
+        if (!strcmp(choice, _("Modern"))){
             rich_animation_additional_parametr(vbox,priv);
         }
-        if (!strcmp(choice, "Matrix")){
+        if (!strcmp(choice, _("Matrix"))){
             rich_animation_additional_parametr(vbox,priv);
         }
-        if (!strcmp(choice, "Video")){
+
+        if (!strcmp(choice, _("Accel"))){
+            rich_animation_additional_parametr(vbox,priv);
+        }
+        if (!strcmp(choice, _("Video"))){
             additional_parametr_for_theme_video(vbox, priv);
         }
-
     }
     gtk_widget_show(vbox);
 }
+/********************************************************************************/
+void
+changed_value_category_cb (HildonPickerButton *picker, Animation_WallpaperPrivate *priv)
+{
+    GtkWidget *theme_button = NULL;
+    const gchar *choice = hildon_button_get_value(HILDON_BUTTON (picker));
+
+    theme_button = g_object_get_data(G_OBJECT(priv->window), "theme_button");
+    if (!theme_button) 
+        return;
+    HildonTouchSelector * selector =  hildon_picker_button_get_selector((HildonPickerButton *) theme_button);
+    hildon_touch_selector_remove_column(selector, 0); 
+    hildon_touch_selector_append_text_column(selector, (GtkTreeModel*)gtk_list_store_new (1, G_TYPE_STRING), TRUE);
+    fill_theme_button(priv, theme_button, (gchar *)hildon_button_get_value(HILDON_BUTTON (picker)));
+    /* check xscreensaver category */
+    if (choice){
+        if (!strcmp(choice,"Xscreensaver"))
+            if (access("/usr/bin/xscreensaver", F_OK) != 0){
+                show_problem_package((GtkWidget *)picker, "Xscreensaver");
+            }
+
+    }
+}
+/********************************************************************************/
+void
+fill_theme_button (Animation_WallpaperPrivate *priv, GtkWidget *button, gchar *category){
+
+    gchar *theme = priv->theme;
+    gboolean flag = False;
+    gint num=0;
+        hildon_button_set_value(HILDON_BUTTON (button), NULL);
+    if (!category){
+        changed_value_theme_cb(HILDON_PICKER_BUTTON (button), priv);
+        return;
+    }
+    GSList *store = priv->extheme_list;
+    HildonTouchSelector * selector =  hildon_picker_button_get_selector((HildonPickerButton *) button);
+    if (!selector)
+        selector = (HildonTouchSelector *)hildon_touch_selector_new_text ();
+    
+    hildon_button_set_value(HILDON_BUTTON(button), NULL);
+    if (!strcmp(category, "LiveWallpaper")){
+        hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Berlin"));
+        hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Modern"));
+        hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Matrix"));
+        hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Accel"));
+        hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Video"));
+        num = 5;        
+        if (theme){ 
+            if (!strcmp(theme, "Berlin")){
+                hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0);
+                hildon_button_set_value(HILDON_BUTTON(button), _("Berlin"));
+            }
+            if (!strcmp(theme, "Modern")){
+                hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 1);
+                hildon_button_set_value(HILDON_BUTTON(button), _("Modern"));
+            }
+            if (!strcmp(theme, "Matrix")){
+                hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 2);
+                hildon_button_set_value(HILDON_BUTTON(button), _("Matrix"));
+            }
+            if (!strcmp(theme, "Accel")){
+                hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 3);
+                hildon_button_set_value(HILDON_BUTTON(button), _("Accel"));
+            }
+            if (!strcmp(theme, "Video")){
+                hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 4);
+                hildon_button_set_value(HILDON_BUTTON(button), _("Video"));
+            }
+       }
+    }
+    while (store){  
+        if (!g_hash_table_lookup(store->data, "category"))
+            continue;
+        if (!strcmp(g_hash_table_lookup(store->data, "category"), category)){
+            hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), g_hash_table_lookup(store->data, "name"));
+            if (!strcmp(theme, g_hash_table_lookup(store->data, "name"))){
+                hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, num);
+                hildon_button_set_value(HILDON_BUTTON(button), _(g_hash_table_lookup(store->data, "name")));
+            }
+            num++;
+        }
+        store = g_slist_next(store);
+    }
+    /* Added Shreman's Aquarium for message */
+    if (!strcmp(category, "Unknown")){
+        store = priv->extheme_list;
+        while (store){  
+            if (!strcmp("Shermans Aquarium" , g_hash_table_lookup(store->data, "name"))){
+                flag = TRUE;
+                break;
+            }
+            store = g_slist_next(store);
+        }
+        if (!flag)
+            hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Shermans Aquarium");
+    }
+
+        hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button),
+                                                       HILDON_TOUCH_SELECTOR (selector));
+
+    changed_value_theme_cb(HILDON_PICKER_BUTTON (button), priv);
+}
+/********************************************************************************/
+GtkWidget *
+create_themes_button (Animation_WallpaperPrivate *priv, gchar *category){
+
+    GtkWidget *button;
+    button = hildon_picker_button_new (HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+    hildon_button_set_title (HILDON_BUTTON (button), _("Theme"));
 
+   
+    return button;
+}
 /********************************************************************************/
 GtkWidget *
-create_themes_button (gchar *theme){
+create_categories_button (Animation_WallpaperPrivate *priv){
 
     GtkWidget *button;
     GtkWidget *selector;
-
-    selector = create_theme_selector();
-    button = hildon_picker_button_new (HILDON_SIZE_AUTO, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
-    hildon_button_set_title (HILDON_BUTTON (button), _("Theme"));
+    gchar *theme = priv->theme;
+    gint num=0;
+    GHashTable *result_table = NULL;
+
+    result_table = g_hash_table_new(g_str_hash, g_str_equal);
+    selector = create_category_selector(priv);
+    button = hildon_picker_button_new (HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+    hildon_button_set_title (HILDON_BUTTON (button), _("Category"));
     hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button),
                                                        HILDON_TOUCH_SELECTOR (selector));
     if (theme) {
         if (!strcmp(theme, "Berlin")){
-            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0);
-            hildon_button_set_value(HILDON_BUTTON(button), _("Berlin"));
+            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0); 
+            hildon_button_set_value(HILDON_BUTTON(button), "LiveWallpaper");
         }
         if (!strcmp(theme, "Modern")){
-            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 1);
-            hildon_button_set_value(HILDON_BUTTON(button), _("Modern"));
+            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0); 
+            hildon_button_set_value(HILDON_BUTTON(button), "LiveWallpaper");
         }
         if (!strcmp(theme, "Matrix")){
-            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 2);
-            hildon_button_set_value(HILDON_BUTTON(button), _("Matrix"));
+            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0); 
+            hildon_button_set_value(HILDON_BUTTON(button), "LiveWallpaper");
         }
         if (!strcmp(theme, "Accel")){
-            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 2);
-            hildon_button_set_value(HILDON_BUTTON(button), _("Accel"));
+            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0); 
+            hildon_button_set_value(HILDON_BUTTON(button), "LiveWallpaper");
         }
-
         if (!strcmp(theme, "Video")){
-            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 3);
-            hildon_button_set_value(HILDON_BUTTON(button), _("Video"));
+            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0); 
+            hildon_button_set_value(HILDON_BUTTON(button), "LiveWallpaper");
         }
+        GSList *store = priv->extheme_list;
+        num = 1;
+        while (store){
+            if (g_hash_table_lookup(result_table, g_hash_table_lookup(store->data, "category")) == NULL){
+                g_hash_table_insert(result_table, g_hash_table_lookup(store->data, "category"), (gint *)num);     
+                num++;
+            }
+            if (!strcmp(theme, g_hash_table_lookup(store->data, "name"))){
+                if (g_hash_table_lookup(store->data, "category")){
+                    hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 
+                    (gint)g_hash_table_lookup(result_table, g_hash_table_lookup(store->data, "category"))); 
+                    hildon_button_set_value(HILDON_BUTTON(button), g_hash_table_lookup(store->data, "category"));
+                }
+                break;
+            }
 
+            store = g_slist_next(store);
+        }
     }
-    
     return button;
 }
 
 /*******************************************************************************/
 GtkWidget *
-create_rich_animation_button (gboolean active, gchar *name)
+create_bool_button (gboolean active, gchar *name)
 {
     GtkWidget *button;
-    button = hildon_check_button_new (HILDON_SIZE_AUTO);
+    button = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
     gtk_button_set_label (GTK_BUTTON (button), name);
     hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
     return button;
@@ -204,7 +435,7 @@ GtkWidget *
 create_enable_button (gboolean active)
 {
     GtkWidget *button;
-    button = hildon_check_button_new (HILDON_SIZE_AUTO);
+    button = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable"));
     hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
     return button;
@@ -216,49 +447,83 @@ show_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv){
     lw_main_settings(priv, NULL);
 }
 /*******************************************************************************/
-void 
-lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
-    gint result;
-    GtkWidget *window = NULL;
+void
+create_themes_buttons_hbox(Animation_WallpaperPrivate *priv){
+    GtkWidget *hbox = NULL;
+    GtkWidget *area_hbox = NULL;
     GtkWidget *theme_button1;
     GtkWidget *theme_button2;
     GtkWidget *theme_button3;
-    GtkWidget *theme_button4;
-    GtkWidget *hbox;
-    Animation_WallpaperPrivate *priv_temp = NULL;
-
-    window = gtk_dialog_new();
+    GtkWidget *theme_button4;    
 
-    gtk_window_set_title(GTK_WINDOW(window), _("Live Wallpaper Settings"));
-    gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-    gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-    /* Create Theme button */
-    hbox = gtk_hbox_new(FALSE, 5);
+        
+    area_hbox = g_object_get_data(G_OBJECT(priv->window), "area_hbox");
+    if (!area_hbox)
+        return;
+    hbox = g_object_get_data(G_OBJECT(priv->window), "custom_hbox");
+    if (hbox){
+        gtk_widget_destroy(hbox);
+    }
+    hbox = gtk_hbox_new(FALSE, 0);
+    g_object_set_data(G_OBJECT(priv->window), "custom_hbox", hbox);
+    gtk_box_pack_start(GTK_BOX(area_hbox),
+                                   hbox, FALSE, FALSE, 5);
+    /* Create Theme buttons */
     theme_button1 = create_image_button(1, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button1, TRUE, TRUE, 5);
+                                   theme_button1, TRUE, TRUE, 0);
+    gtk_widget_show (theme_button1);
+    gtk_widget_show (hbox);
+    if (priv->one_in_all_view)
+        return;
     theme_button2 = create_image_button(2, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button2, TRUE, TRUE, 5);
+                                   theme_button2, TRUE, TRUE, 0);
+    gtk_widget_show (theme_button2);
     theme_button3 = create_image_button(3, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button3, TRUE, TRUE, 5);
+                                   theme_button3, TRUE, TRUE, 0);
+    gtk_widget_show (theme_button3);
     theme_button4 = create_image_button(4, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button4, TRUE, TRUE, 5);
+                                   theme_button4, TRUE, TRUE, 0);
+    gtk_widget_show (theme_button4);
+ 
+}
+/*******************************************************************************/
+void 
+lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
+    gint result;
+    GtkWidget *window = NULL;
+    GtkWidget *banner = NULL;
+    GtkWidget *area_hbox;
+    GtkWidget *one_in_all_view_button; 
+    gboolean one_in_all_view;
+    Animation_WallpaperPrivate *priv_temp = NULL;
+
+    window = gtk_dialog_new();
+    priv->window = window;
+
+    one_in_all_view = priv->one_in_all_view;
+    gtk_window_set_title(GTK_WINDOW(window), _("Live Wallpaper Settings"));
+    gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+    gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+    one_in_all_view_button = create_bool_button(priv->one_in_all_view, _("One theme in all views"));
+    g_signal_connect (G_OBJECT (one_in_all_view_button), "toggled",  G_CALLBACK (changed_value_one_in_all_cb), priv);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), one_in_all_view_button, TRUE, TRUE, 5);
+    area_hbox = gtk_vbox_new(FALSE, 2);
+    g_object_set_data(G_OBJECT(window), "area_hbox", area_hbox);
+    create_themes_buttons_hbox(priv);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
-                                   hbox, TRUE, TRUE, 5);
+                                   area_hbox, TRUE, TRUE, 0);
 
-    gtk_widget_show (theme_button1);
-    gtk_widget_show (theme_button2);
-    gtk_widget_show (theme_button3);
-    gtk_widget_show (theme_button4);
-    gtk_widget_show_all (hbox);
+    gtk_widget_show (one_in_all_view_button);
+    gtk_widget_show_all (area_hbox);
     gtk_widget_show (window);
     gtk_dialog_add_button(GTK_DIALOG(window), _("About"), GTK_RESPONSE_NO);
 
     result = gtk_dialog_run(GTK_DIALOG(window));
-
+/*
     priv_temp = g_object_get_data(G_OBJECT(theme_button1), "priv");
     if (priv_temp){
         g_free(priv_temp);
@@ -279,7 +544,7 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
         g_free(priv_temp);
         priv_temp =NULL;
     }
-
+*/
 
     switch(result){
         case GTK_RESPONSE_NO:
@@ -289,7 +554,29 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
         break;
     }
 
-
+    if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)) != one_in_all_view){
+        save_one_in_all_views_to_config(hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)));
+        fprintf(stderr,"CHECK!!!!!!!!!!!!!!\n");
+        banner = hildon_banner_show_information (window, NULL, _("Livewallpaper is reloading..."));
+        hildon_banner_set_timeout(banner, 3000);
+        gtk_widget_show(banner);
+        gtk_main_iteration_do(FALSE);
+        stop_applet(1);
+        stop_applet(2);
+        stop_applet(3);
+        stop_applet(4);
+        sleep(1);
+        gtk_main_iteration_do(FALSE);
+        sleep(1);
+        gtk_main_iteration_do(FALSE);
+        sleep(1);
+        gtk_main_iteration_do(FALSE);
+        start_applet(1);
+        start_applet(2);
+        start_applet(3);
+        start_applet(4);
+        
+    }
     if (window)
         gtk_widget_destroy(window);
 }
@@ -315,8 +602,9 @@ file_button_clicked(GtkButton *button, Animation_WallpaperPrivate *priv){
 void
 rich_animation_additional_parametr(GtkWidget *vbox, Animation_WallpaperPrivate *priv){
     GtkWidget *rich_animation_button;
+
     /* Create rich animation button */  
-    rich_animation_button = create_rich_animation_button(priv->rich_animation, _("Rich Animation"));
+    rich_animation_button = create_bool_button(priv->rich_animation, _("Rich Animation"));
     gtk_box_pack_start(GTK_BOX(vbox),
                                    rich_animation_button, TRUE, TRUE, 5);
     g_object_set_data(G_OBJECT(priv->window), "rich_animation_button", rich_animation_button);
@@ -340,25 +628,46 @@ additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate
 
     gtk_box_pack_start(GTK_BOX(vbox),
                                    file_button, TRUE, TRUE, 5);
-    g_object_set_data(G_OBJECT(priv->window), "filename_button", file_button);    /* Create rich animation button */  
-    rich_animation_button = create_rich_animation_button(priv->rich_animation, _("Loop"));
+    g_object_set_data(G_OBJECT(priv->window), "filename_button", file_button);    
+    /* Create rich animation button */  
+    rich_animation_button = create_bool_button(priv->rich_animation, _("Loop"));
     gtk_box_pack_start(GTK_BOX(vbox),
                                    rich_animation_button, TRUE, TRUE, 5);
     g_object_set_data(G_OBJECT(priv->window), "rich_animation_button", rich_animation_button);
+    /* Create sound button */  
+#if 0
 
+    /* Doesn't work in real device. Hardware volume buttons can to change volume for mutted track */
+    sound_button = create_bool_button(priv->theme_bool_parametr1, _("Sound"));
+    gtk_box_pack_start(GTK_BOX(vbox),
+                                   sound_button, TRUE, TRUE, 5);
+    g_object_set_data(G_OBJECT(priv->window), "sound_button", sound_button);
+    gtk_widget_show (sound_button);
+#endif
     gtk_widget_show (file_button);
     gtk_widget_show (rich_animation_button);
 
 }
 /*******************************************************************************/
+void
+show_problem_package (GtkWidget *widget, gchar *package_name){
+    gchar *text;
+    text = g_strdup_printf(_("You haven't got the installed package %s. Please install it via using Application Manager"), package_name);
+    hildon_banner_show_information(GTK_WIDGET(widget), NULL, text);
+    g_free(text);
+}
+/*******************************************************************************/
 void 
 lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
     gint result;
     GtkWidget *window = NULL;
+    GtkWidget *scrolled_window = NULL;
     GtkWidget *save_button;
     GtkWidget *theme_button;
+    GtkWidget *category_button;
     GtkWidget *enable_button;
     GtkWidget *vbox;
+    GtkWidget *area_vbox;
     GtkWidget *button1 = NULL;
     GtkWidget *rich_animation_button = NULL;
     gint view = priv->view;
@@ -369,35 +678,51 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
     gtk_window_set_title(GTK_WINDOW(window), _("View Settings"));
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-    /* Create Enable button */
-    enable_button = create_enable_button(check_applet_state(view)); 
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
-                                   enable_button, TRUE, TRUE, 5);
-    /* Create Theme button */
-    theme_button = create_themes_button(priv->theme);
-    g_signal_connect (G_OBJECT (theme_button), "value-changed",  G_CALLBACK (changed_value_theme_cb), priv);
+
+    /* Create panarea */
+    area_vbox = gtk_vbox_new(FALSE, 2);
+    g_object_set_data(G_OBJECT(window), "area_vbox", area_vbox);
+    scrolled_window = hildon_pannable_area_new ();
+    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA (scrolled_window), GTK_WIDGET (area_vbox));
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
-                                   theme_button, TRUE, TRUE, 5);
+                                   scrolled_window, FALSE, FALSE, 0);
 
-    /* Create custom vbox */
+    gtk_widget_set_size_request(scrolled_window, -1, 370);
+
+    /* Create Enable button */
+    enable_button = create_enable_button(check_applet_state(view)); 
+    gtk_box_pack_start(GTK_BOX(area_vbox),
+                                   enable_button, FALSE, FALSE, 5);
+    /* Create Category button */
+    category_button = create_categories_button(priv);
+    g_object_set_data(G_OBJECT(window), "category_button", category_button);
+    g_signal_connect (G_OBJECT (category_button), "value-changed",  G_CALLBACK (changed_value_category_cb), priv);
+    gtk_box_pack_start(GTK_BOX(area_vbox),
+                                   category_button, FALSE, FALSE, 5);
+    /* Create Custom vbox */
     vbox = gtk_vbox_new (FALSE, 5);
     g_object_set_data(G_OBJECT(window), "custom_vbox", vbox);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
-                                   vbox, TRUE, TRUE, 5);
-    if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Berlin"))||
-        !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix"))||
-        !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Modern"))){
-        rich_animation_additional_parametr(vbox, priv);
-    }
 
-    if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Video"))){
-        additional_parametr_for_theme_video(vbox, priv);
-    } 
+    /* Create Theme button */
+    theme_button = create_themes_button(priv, (gchar *)hildon_button_get_value(HILDON_BUTTON (category_button)));
+    g_object_set_data(G_OBJECT(window), "theme_button", theme_button);
+    g_signal_connect (G_OBJECT (theme_button), "value-changed",  G_CALLBACK (changed_value_theme_cb), priv);
+    gtk_box_pack_start(GTK_BOX(area_vbox),
+                                   theme_button, FALSE, FALSE, 5);
+    fill_theme_button(priv, theme_button, (gchar *)hildon_button_get_value(HILDON_BUTTON (category_button)));
+
+    /* Pack custom vbox. It must be last widget */
+    gtk_box_pack_start(GTK_BOX(area_vbox),
+                                   vbox, FALSE, FALSE, 5);
 
     gtk_widget_show (enable_button);
+    gtk_widget_show (category_button);
     gtk_widget_show (theme_button);
     gtk_widget_show (vbox);
+    gtk_widget_show (area_vbox);
+    gtk_widget_show (scrolled_window);
     gtk_widget_show (window);
+
     save_button = gtk_dialog_add_button(GTK_DIALOG(window), _("Save"), GTK_RESPONSE_YES);
 
     result = gtk_dialog_run(GTK_DIALOG(window));
@@ -405,11 +730,51 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
     switch(result){
         case GTK_RESPONSE_YES:
             /* Check theme */
-            if (hildon_button_get_value(HILDON_BUTTON (theme_button))){
+            if (hildon_button_get_value(HILDON_BUTTON (theme_button)) &&
+                strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "")){
+                /* Check Xsnow program */
+                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Xsnow"))){
+                    if (access("/usr/bin/xsnow", F_OK) != 0){
+                        show_problem_package(button, "Xsnow");
+                        /* if not scuccess exit from wthout saving */ 
+                        break;
+                    }
+                }
+                /* Check Shermans program */
+                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Shermans Aquarium")){
+                    if (access("/usr/bin/shermans", F_OK) != 0){
+                        show_problem_package(button,"'Sherman's Aquarium'");
+                        /* if not scuccess exit from wthout saving */ 
+                        break;
+                    }
+                }
+                /* Check Conky program */
+                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Conky")){
+                    if (access("/usr/bin/conky", F_OK) != 0){
+                        show_problem_package(button,"'Conky'");
+                        /* if not scuccess exit from wthout saving */ 
+                        break;
+                    }
+                }
+                /* Check Orrery program */
+                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Orrery")){
+                    if (access("/opt/maemo/usr/bin/orrery", F_OK) != 0){
+                        show_problem_package(button,"'Orrery'");
+                        /* if not scuccess exit from wthout saving */ 
+                        break;
+                    }
+                }
+                /* Check Colorflood program */
+                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Colorflood")){
+                    if (access("/usr/bin/colorflood", F_OK) != 0){
+                        show_problem_package(button,"'Colorflood'");
+                        /* if not scuccess exit from wthout saving */ 
+                        break;
+                    }
+                }
 
                 if (priv->theme)
                     g_free(priv->theme);
-
                 if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Berlin")))
                     priv->theme = g_strdup("Berlin");
                 if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Modern")))
@@ -426,6 +791,25 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                             g_free(priv->theme_string_parametr1);
                         priv->theme_string_parametr1 = g_strdup((gchar*)hildon_button_get_value (HILDON_BUTTON(button1)));
                     }
+                    /* 
+                    temp_button = g_object_get_data(G_OBJECT(priv->window), "sound_button");
+                    if (temp_button){
+                        if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(temp_button)))
+                            priv->theme_bool_parametr1 = TRUE;
+                        else
+                            priv->theme_bool_parametr1 = FALSE;
+                    }
+                    */
+                }
+                /* Check external themes */
+                GSList *store = priv->extheme_list;
+                while (store){
+                    if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _(g_hash_table_lookup(store->data, "name")))){
+                        priv->theme = g_strdup(g_hash_table_lookup(store->data, "name"));
+                        //priv->hash_theme = store->data;
+                        break;
+                    }
+                    store = g_slist_next(store);
                 }
 
             }
@@ -454,7 +838,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                     if (check_applet_state(view))
                         stop_applet(view);
 
-            set_button_image(button, priv->theme, check_applet_state(view));
+            set_button_image(button, priv, check_applet_state(view));
             break;
         default:
         case GTK_RESPONSE_OK:
@@ -488,26 +872,6 @@ check_applet_state(gint number){
         g_free(str);
     }
     return result;
-#if 0
-    FILE    *file_in = NULL;
-    gchar buffer[2048];
-
-    file_in = fopen("/home/user/.config/hildon-desktop/home.plugins","r");
-    if (file_in){
-
-        fprintf(stderr,"Check applet state\n");
-        while (!feof(file_in)) {
-                memset(buffer, 0, sizeof(buffer));
-                fgets(buffer, sizeof(buffer) - 1, file_in);
-                if (!strcmp(buffer, 
-                            "X-Desktop-File=/usr/share/applications/hildon-home/livewp-home-widget.desktop\n")){
-                    result = TRUE;
-                    break;
-                }
-       }
-        fclose(file_in);
-    }
-#endif
 }
 /*******************************************************************************/
 void
@@ -556,40 +920,4 @@ stop_applet(gint number){
         g_free(str);
     g_object_unref(config_file);
 
-#if 0    
-    FILE    *file_in;
-    FILE    *file_out;
-    gchar buffer[2048];
-    gchar * str = NULL;
-
-    file_in = fopen("/home/user/.config/hildon-desktop/home.plugins","r");
-    file_out = fopen("/tmp/livewallpaper.plugins","w");
-    if (file_in && file_out){
-        while (!feof(file_in)) {
-            memset(buffer, 0, sizeof(buffer));
-            fgets(buffer, sizeof(buffer) - 1, file_in);
-            str = g_strdup_printf("[livewp-home-widget.desktop-%i]\n", number);
-            if (strcmp(buffer, str) &&
-                strcmp(buffer, "X-Desktop-File=/usr/share/applications/hildon-home/livewp-home-widget.desktop\n"))
-                fputs(buffer, file_out);
-        }
-        if (str){
-            g_free(str);
-        }
-        fclose(file_out);
-        fclose(file_in);
-        file_in = fopen("/tmp/livewallpaper.plugins","r");
-        file_out = fopen("/home/user/.config/hildon-desktop/home.plugins","w");
-        if (file_in && file_out){
-            while (!feof(file_in)){
-                memset(buffer, 0, sizeof(buffer));
-                fgets(buffer, sizeof(buffer) - 1, file_in);
-                fputs(buffer, file_out);
-            }
-            fclose(file_out);
-            fclose(file_in);
-            unlink ("/tmp/livewallpaper.plugins");
-        }
-    }
-#endif
 }