X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=applet%2Fsrc%2Flivewp-settings.c;h=b81e10788f6f2ca0157c5b5053238318abd673cf;hb=67ad3fe0e3a8715d861279e5da8a35806aab124c;hp=69d1b4da09427dec3c610db3303ba79e999cc060;hpb=37ac205299ec0f737eace0ed647b9501ec130c23;p=livewp diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index 69d1b4d..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.8.1 \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 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); @@ -60,17 +64,25 @@ create_category_selector (Animation_WallpaperPrivate *priv){ 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"))) + 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); - + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Xscreensaver"); + } +#if 0 category_list = g_hash_table_get_keys (result_table); selector = hildon_touch_selector_new_text(); @@ -78,9 +90,10 @@ create_category_selector (Animation_WallpaperPrivate *priv){ 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; } @@ -159,7 +172,6 @@ set_button_image(GtkWidget * button, Animation_WallpaperPrivate *priv, gboolean /********************************************************************************/ GtkWidget * create_image_button (gint view, DBusConnection *conn_sess){ - GtkWidget *button; GtkWidget *event_box; Animation_WallpaperPrivate *priv = g_new0(Animation_WallpaperPrivate, 1); @@ -190,6 +202,14 @@ 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)); @@ -245,8 +265,7 @@ changed_value_category_cb (HildonPickerButton *picker, Animation_WallpaperPrivat if (choice){ if (!strcmp(choice,"Xscreensaver")) if (access("/usr/bin/xscreensaver", F_OK) != 0){ - hildon_banner_show_information(GTK_WIDGET(picker), NULL, - _("You haven't got the installed package Xscreensaver. Please install it via using Application Manager")); + show_problem_package((GtkWidget *)picker, "Xscreensaver"); } } @@ -316,14 +335,14 @@ fill_theme_button (Animation_WallpaperPrivate *priv, GtkWidget *button, gchar *c if (!strcmp(category, "Unknown")){ store = priv->extheme_list; while (store){ - if (!strcmp("Sherman's Aquarium" , g_hash_table_lookup(store->data, "name"))){ + 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), "Sherman's Aquarium"); + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Shermans Aquarium"); } hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button), @@ -387,10 +406,11 @@ create_categories_button (Animation_WallpaperPrivate *priv){ num++; } if (!strcmp(theme, g_hash_table_lookup(store->data, "name"))){ - if (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; } @@ -405,7 +425,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; @@ -427,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; + GtkWidget *theme_button4; - 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; + 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); @@ -490,7 +544,7 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){ g_free(priv_temp); priv_temp =NULL; } - +*/ switch(result){ case GTK_RESPONSE_NO: @@ -500,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); } @@ -573,6 +649,14 @@ additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate } /*******************************************************************************/ +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; @@ -583,7 +667,6 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { GtkWidget *category_button; GtkWidget *enable_button; GtkWidget *vbox; - GtkWidget *temp_button; GtkWidget *area_vbox; GtkWidget *button1 = NULL; GtkWidget *rich_animation_button = NULL; @@ -652,17 +735,39 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { /* Check Xsnow program */ if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Xsnow"))){ if (access("/usr/bin/xsnow", F_OK) != 0){ - hildon_banner_show_information(GTK_WIDGET(button), NULL, - _("You haven't got the installed package Xsnow. Please install it via using Application Manager")); + show_problem_package(button, "Xsnow"); /* if not scuccess exit from wthout saving */ break; } } - /* Check Xsnow program */ - if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Sherman's Aquarium")){ + /* Check Shermans program */ + if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Shermans Aquarium")){ if (access("/usr/bin/shermans", F_OK) != 0){ - hildon_banner_show_information(GTK_WIDGET(button), NULL, - _("You haven't got the installed package 'Sherman's Aquarium'. Please install it via using Application Manager")); + 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; }