X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=applet%2Fsrc%2Flivewp-settings.c;h=d661c4069a5a424e21c73a7f211f0427b0670690;hb=b51f516aef601a5db04c6e4841dc8744d4ea26cf;hp=956b95f250f224c1a3c01e0d5acf5dc0f36df2ca;hpb=8e1d006876cf3147181b7664cde45bb64f852bd2;p=livewp diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index 956b95f..d661c40 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -1,21 +1,21 @@ /* vim: set sw=4 ts=4 et: */ /* * This file is part of Live Wallpaper (livewp) - * + * * Copyright (C) 2010 Vlad Vasiliev * Copyright (C) 2010 Tanya Makova * 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 * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -26,6 +26,7 @@ /*******************************************************************************/ void lw_about(void){ + gchar *about_string; GtkWidget *window = NULL, *vbox = NULL, *label_about = NULL; @@ -34,15 +35,19 @@ 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.8.5 \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, Modern and Accel Vasya Bobrikov\n \ -Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \ +Copyright(c) 2010 for design themes Matrix, Fifteen \nand for icons Andrew Zhilin\n \ Translators:\n \ Finnish - Marko Vertainen\n \ Spain - Alejandro López\n \ +Italian - Emanuele Cassioli\n \ +Dutch - Roland van Tilburg (aka ROLAN900D) \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); @@ -57,30 +62,26 @@ GtkWidget * 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); + 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")) + if (!g_hash_table_lookup(result_table,"Xscreensaver")){ g_hash_table_insert(result_table, "Xscreensaver", (gint *)1); - - - category_list = g_hash_table_get_keys (result_table); - selector = hildon_touch_selector_new_text(); - - 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 ); - category_list = g_list_next(category_list); + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Xscreensaver"); } - return selector; } @@ -92,7 +93,7 @@ theme_button_clicked(GtkWidget *button, GdkEventButton *event, Animation_Wallpap /********************************************************************************/ void set_button_image(GtkWidget * button, Animation_WallpaperPrivate *priv, gboolean enable){ - GtkWidget * image = NULL; + GtkWidget * image = NULL; GdkPixbuf * pixbuf = NULL; gchar *str = NULL; gchar *icon_on = NULL; @@ -110,30 +111,30 @@ set_button_image(GtkWidget * button, Animation_WallpaperPrivate *priv, gboolean if (enable){ if (icon_on) str = g_strdup_printf("%s", icon_on); - else - str = g_strdup_printf( "%s/%s/%s", THEME_PATH, + 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, + 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, + 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, + str = g_strdup_printf( "%s/%s/%s", THEME_PATH, "Video", "icond.png"); } } - pixbuf = gdk_pixbuf_new_from_file_at_size (str, - 124, - 79, + pixbuf = gdk_pixbuf_new_from_file_at_size (str, + 124, + 79, NULL); if (str) g_free(str); @@ -189,12 +190,20 @@ create_image_button (gint view, DBusConnection *conn_sess){ } /********************************************************************************/ 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 changed_value_theme_cb (HildonPickerButton *picker, Animation_WallpaperPrivate *priv) { 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; @@ -234,10 +243,10 @@ changed_value_category_cb (HildonPickerButton *picker, Animation_WallpaperPrivat 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) + if (!theme_button) return; HildonTouchSelector * selector = hildon_picker_button_get_selector((HildonPickerButton *) theme_button); - hildon_touch_selector_remove_column(selector, 0); + 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 */ @@ -265,7 +274,7 @@ fill_theme_button (Animation_WallpaperPrivate *priv, GtkWidget *button, gchar *c 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")); @@ -273,8 +282,8 @@ fill_theme_button (Animation_WallpaperPrivate *priv, GtkWidget *button, gchar *c 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){ + 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")); @@ -297,7 +306,7 @@ fill_theme_button (Animation_WallpaperPrivate *priv, GtkWidget *button, gchar *c } } } - while (store){ + while (store){ if (!g_hash_table_lookup(store->data, "category")) continue; if (!strcmp(g_hash_table_lookup(store->data, "category"), category)){ @@ -313,7 +322,7 @@ fill_theme_button (Animation_WallpaperPrivate *priv, GtkWidget *button, gchar *c /* Added Shreman's Aquarium for message */ if (!strcmp(category, "Unknown")){ store = priv->extheme_list; - while (store){ + while (store){ if (!strcmp("Shermans Aquarium" , g_hash_table_lookup(store->data, "name"))){ flag = TRUE; break; @@ -337,7 +346,7 @@ create_themes_button (Animation_WallpaperPrivate *priv, gchar *category){ button = hildon_picker_button_new (HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_VERTICAL); hildon_button_set_title (HILDON_BUTTON (button), _("Theme")); - + return button; } /********************************************************************************/ @@ -358,37 +367,38 @@ create_categories_button (Animation_WallpaperPrivate *priv){ HILDON_TOUCH_SELECTOR (selector)); if (theme) { if (!strcmp(theme, "Berlin")){ - hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0); + 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, 0); + 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, 0); + 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, 0); + 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, 0); + 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); + 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"))); + 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; } @@ -403,7 +413,7 @@ GtkWidget * 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; @@ -425,49 +435,82 @@ 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(); - 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 */ + 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, 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, 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, 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, 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; + + 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); @@ -488,7 +531,7 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){ g_free(priv_temp); priv_temp =NULL; } - +*/ switch(result){ case GTK_RESPONSE_NO: @@ -498,9 +541,33 @@ 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(HILDON_BANNER(banner), 3000); + stop_applet(1); + stop_applet(2); + stop_applet(3); + stop_applet(4); + g_timeout_add(3000, (GSourceFunc)cb_timeout_settings, window); + }else{ + if (window) + gtk_widget_destroy(window); + } +} +/*******************************************************************************/ +gboolean +cb_timeout_settings(GtkWidget *window){ + + start_applet(1); + start_applet(2); + start_applet(3); + start_applet(4); if (window) gtk_widget_destroy(window); + return FALSE; } /*******************************************************************************/ void @@ -525,7 +592,7 @@ void rich_animation_additional_parametr(GtkWidget *vbox, Animation_WallpaperPrivate *priv){ GtkWidget *rich_animation_button; - /* Create rich animation button */ + /* Create rich animation button */ rich_animation_button = create_bool_button(priv->rich_animation, _("Rich Animation")); gtk_box_pack_start(GTK_BOX(vbox), rich_animation_button, TRUE, TRUE, 5); @@ -537,6 +604,7 @@ void additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate *priv){ GtkWidget *file_button; + GtkWidget *smoothing_button; GtkWidget *rich_animation_button; if (priv->theme_string_parametr1) @@ -550,22 +618,19 @@ 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 */ + 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 + /* Create Smoothing button */ - /* 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")); + smoothing_button = create_bool_button(priv->theme_bool_parametr1, _("Smoothing (Need more memory)")); 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 + smoothing_button, TRUE, TRUE, 5); + g_object_set_data(G_OBJECT(priv->window), "smoothing_button", smoothing_button); + gtk_widget_show (smoothing_button); gtk_widget_show (file_button); gtk_widget_show (rich_animation_button); @@ -579,7 +644,16 @@ show_problem_package (GtkWidget *widget, gchar *package_name){ g_free(text); } /*******************************************************************************/ -void +void +show_duplicate_theme (GtkWidget *widget, gchar *theme_name){ + gchar *text; + text = g_strdup_printf(_("Theme %s has already been selected"), theme_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; @@ -590,9 +664,11 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { GtkWidget *enable_button; GtkWidget *vbox; GtkWidget *area_vbox; + GtkWidget *temp_button; GtkWidget *button1 = NULL; GtkWidget *rich_animation_button = NULL; gint view = priv->view; + gint count; window = gtk_dialog_new(); priv->window = window; @@ -612,7 +688,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { gtk_widget_set_size_request(scrolled_window, -1, 370); /* Create Enable button */ - enable_button = create_enable_button(check_applet_state(view)); + 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 */ @@ -654,23 +730,57 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { /* Check theme */ if (hildon_button_get_value(HILDON_BUTTON (theme_button)) && strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "")){ +#if 0 /* 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 */ + /* if not scuccess exit from wthout saving */ break; } } - /* Check Xsnow program */ + /* 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 */ + /* 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 CrazyChickens program */ + if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "CrazyChickens")){ + if (access("/usr/bin/crazychickens", F_OK) != 0){ + show_problem_package(button,"'Crazy Chickens'"); + /* 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; + } + } +#endif if (priv->theme) g_free(priv->theme); if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Berlin"))) @@ -689,21 +799,47 @@ 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"); + temp_button = g_object_get_data(G_OBJECT(priv->window), "smoothing_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")); + //check if theme installed + gchar *check_path = g_hash_table_lookup(store->data, "check_path"); + if (check_path){ + if (access(check_path, F_OK) != 0){ + show_problem_package(button, g_hash_table_lookup(store->data, "name")); + gchar * install_file = g_hash_table_lookup(store->data, "install_file"); + if (install_file){ + gchar * cmd = g_strdup_printf("dbus-send --print-reply --dest=com.nokia.osso_browser /com/nokia/osso_browser/service com.nokia.osso_browser.open_new_window string:%s", + install_file); + fprintf(stderr, "system %s\n", cmd); + system(cmd); + g_free(cmd); + } + /* if not success exit from without saving */ + break; + } + } + + + //check if theme already selected + gchar *copies = g_hash_table_lookup(store->data, "copies"); + //fprintf(stderr, "copies = %s\n", copies); + if (copies){ + count = atoi(copies); + }else count = 10; + if (count > get_count_themes_from_config(g_hash_table_lookup(store->data, "name"))) + priv->theme = g_strdup(g_hash_table_lookup(store->data, "name")); + else + show_duplicate_theme(button, g_hash_table_lookup(store->data, "name")); //priv->hash_theme = store->data; break; } @@ -763,7 +899,7 @@ check_applet_state(gint number){ str = g_strdup_printf("livewp-home-widget.desktop-%i", (number - 1)); config_file = hd_config_file_new(NULL, "/home/user/.config/hildon-desktop/", "home.plugins"); - + gkey_file = hd_config_file_load_file(config_file, FALSE); if (gkey_file && str){ result = g_key_file_has_group(gkey_file, str); @@ -783,7 +919,7 @@ start_applet(gint number){ return; str = g_strdup_printf("livewp-home-widget.desktop-%i",(number - 1)); config_file = hd_config_file_new(NULL, "/home/user/.config/hildon-desktop/", "home.plugins"); - + gkey_file = hd_config_file_load_file(config_file, FALSE); if (gkey_file){ g_key_file_set_string (gkey_file, str, "X-Desktop-File", "/usr/share/applications/hildon-home/livewp-home-widget.desktop"); @@ -806,10 +942,10 @@ stop_applet(gint number){ return; str = g_strdup_printf("livewp-home-widget.desktop-%i", (number - 1)); config_file = hd_config_file_new(NULL, "/home/user/.config/hildon-desktop/", "home.plugins"); - + gkey_file = hd_config_file_load_file(config_file, FALSE); if (gkey_file){ - g_key_file_remove_group(gkey_file, str, NULL); + g_key_file_remove_group(gkey_file, str, NULL); hd_config_file_save_file( config_file, gkey_file); g_key_file_free(gkey_file); }else