diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index b947141f7..6402d9449 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -1005,7 +1005,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data e_widget_ilist_multi_select_set(ob, 0); e_widget_min_size_set(ob, 150, 250); e_widget_framelist_object_append(of, ob); - e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 0, 1); of = e_widget_framelist_add(evas, _("Themes"), 0); ob = e_widget_ilist_add(evas, 16, 16, NULL); @@ -1025,7 +1025,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data ob = e_widget_button_add(evas, _("Clear All"), NULL, _cb_adv_btn_clearall, cfdata, NULL); e_widget_list_object_append(ol, ob, 1, 0, 0.5); - e_widget_table_object_append(ot, ol, 0, 1, 1, 1, 1, 0, 1, 0); + e_widget_table_object_append(ot, ol, 0, 1, 1, 1, 1, 0, 0, 0); of = e_widget_framelist_add(evas, _("Preview"), 0); mw = 320; @@ -1037,7 +1037,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data e_widget_preview_edje_set(ob, cfdata->theme, "e/desktop/background"); e_widget_aspect_child_set(oa, ob); e_widget_framelist_object_append(of, oa); - e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 0, 1); + e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1); _fill_files_ilist(cfdata); _fill_categories_ilist(cfdata); diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c index 633819cfa..4d59df20c 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c @@ -483,9 +483,11 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) E_Zone *zone = NULL; E_Radio_Group *rg; char path[PATH_MAX]; - int mw, mh; + int mw, mh, online; const char *f; + online = ecore_file_download_protocol_available("http://"); + zone = e_zone_current_get(cfd->con); o = e_widget_list_add(evas, 0, 1); @@ -535,14 +537,14 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) &cfdata->use_theme_bg); cfdata->o_theme_bg = ow; evas_object_smart_callback_add(ow, "changed", _cb_theme_wallpaper, cfdata); - e_widget_table_object_append(ot, ow, 0, 0, 2, 1, 1, 0, 0, 0); + e_widget_table_object_append(ot, ow, 0, 0, 2 + online, 1, 1, 0, 0, 0); ow = e_widget_button_add(evas, _("Picture..."), "enlightenment/picture", _cb_import, cfdata, NULL); e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0); ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient", _cb_gradient, cfdata, NULL); e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0); - if (ecore_file_download_protocol_available("http://")) + if (online) { ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website", _cb_web, cfdata, NULL); @@ -560,8 +562,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); e_widget_preview_edje_set(ow, f, "e/desktop/background"); e_widget_aspect_child_set(oa, ow); - e_widget_table_object_append(ot, oa, 0, 2, 4, 1, 1, 1, 1, 1); - e_widget_list_object_append(o, ot, 1, 0, 0.5); + e_widget_table_object_append(ot, oa, 0, 2, 2 + online, 1, 1, 1, 1, 1); + e_widget_list_object_append(o, ot, 1, 1, 0.5); e_dialog_resizable_set(cfd->dia, 1); return o; } @@ -609,9 +611,11 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) E_Zone *zone = NULL; E_Radio_Group *rg; char path[PATH_MAX]; - int mw, mh; + int mw, mh, online; const char *f; + online = ecore_file_download_protocol_available("http://"); + zone = e_zone_current_get(cfd->con); o = e_widget_list_add(evas, 0, 1); @@ -659,14 +663,14 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) &cfdata->use_theme_bg); cfdata->o_theme_bg = ow; evas_object_smart_callback_add(ow, "changed", _cb_theme_wallpaper, cfdata); - e_widget_table_object_append(ot, ow, 0, 0, 2, 1, 1, 0, 0, 0); + e_widget_table_object_append(ot, ow, 0, 0, 2 + online, 1, 1, 0, 0, 0); ow = e_widget_button_add(evas, _("Picture..."), "enlightenment/picture", _cb_import, cfdata, NULL); e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0); ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient", _cb_gradient, cfdata, NULL); e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0); - if (ecore_file_download_protocol_available("http://")) + if (online) { ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website", _cb_web, cfdata, NULL); @@ -684,7 +688,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); e_widget_preview_edje_set(ow, f, "e/desktop/background"); e_widget_aspect_child_set(oa, ow); - e_widget_table_object_append(ot, oa, 0, 2, 4, 1, 1, 1, 0, 0); + e_widget_table_object_append(ot, oa, 0, 2, 2 + online, 1, 1, 1, 1, 1); rg = e_widget_radio_group_new(&(cfdata->all_this_desk_screen)); of = e_widget_frametable_add(evas, _("Where to place the Wallpaper"), 0); @@ -697,9 +701,9 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) (e_util_container_zone_number_get(1, 0)))) e_widget_disabled_set(ow, 1); e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); - e_widget_table_object_append(ot, of, 0, 3, 4, 1, 1, 1, 1, 1); + e_widget_table_object_append(ot, of, 0, 3, 2 + online, 1, 1, 1, 1, 0); - e_widget_list_object_append(o, ot, 1, 0, 0.5); + e_widget_list_object_append(o, ot, 1, 1, 0.5); e_dialog_resizable_set(cfd->dia, 1); return o; }