styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

using a great idea from a comment on the release blog, we now don't display the option for live preview in pager if there is an animating background currently set 

SVN revision: 74856
This commit is contained in:
Mike Blumenkrantz 2012-08-03 16:45:24 +00:00
parent 6af55741ae
commit 2cca4bbeff
1 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/modules/pager/e_mod_config.c
View File

@ -146,6 +146,12 @@ static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *ol, *of, *ow;
Eina_Bool disable = EINA_FALSE;
Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
const char *str;
ol = e_widget_list_add(evas, 0, 0);
@ -156,10 +162,26 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
ow = e_widget_check_add(evas, _("Always show desktop names"),
&(cfdata->show_desk_names));
e_widget_framelist_object_append(of, ow);
ow = e_widget_check_add(evas, _("Disable live preview"),
&(cfdata->disable_live_preview));
e_widget_on_change_hook_set(ow, _live_preview_change, NULL);
e_widget_framelist_object_append(of, ow);
EINA_LIST_FOREACH(e_manager_list(), l, man)
EINA_LIST_FOREACH(man->containers, ll, con)
EINA_LIST_FOREACH(con->zones, lll, zone)
{
if (!zone->bg_object) continue;
str = evas_object_type_get(zone->bg_object);
if (!str) continue;
if (strcmp(evas_object_type_get(zone->bg_object), "edje")) continue;
if (!edje_object_animation_get(zone->bg_object)) continue;
disable = EINA_TRUE;
goto out;
}
out:
if (!disable)
{
ow = e_widget_check_add(evas, _("Disable live preview"),
&(cfdata->disable_live_preview));
e_widget_on_change_hook_set(ow, _live_preview_change, NULL);
e_widget_framelist_object_append(of, ow);
}
e_widget_list_object_append(ol, of, 1, 0, 0.5);
of = e_widget_framelist_add(evas, _("Popup"), 0);
@ -204,6 +226,12 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c
{
Evas_Object *otb, *ol, *ow;
Evas_Object *pc, *uc;
Eina_Bool disable = EINA_FALSE;
Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
const char *str;
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
@ -215,9 +243,26 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c
ow = e_widget_check_add(evas, _("Always show desktop names"),
&(cfdata->show_desk_names));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Disable live preview"),
&(cfdata->disable_live_preview));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
EINA_LIST_FOREACH(e_manager_list(), l, man)
EINA_LIST_FOREACH(man->containers, ll, con)
EINA_LIST_FOREACH(con->zones, lll, zone)
{
if (!zone->bg_object) continue;
str = evas_object_type_get(zone->bg_object);
if (!str) continue;
if (strcmp(evas_object_type_get(zone->bg_object), "edje")) continue;
if (!edje_object_animation_get(zone->bg_object)) continue;
disable = EINA_TRUE;
goto out;
}
out:
if (!disable)
{
ow = e_widget_check_add(evas, _("Disable live preview"),
&(cfdata->disable_live_preview));
e_widget_on_change_hook_set(ow, _live_preview_change, NULL);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
}
ow = e_widget_label_add(evas, _("Resistance to dragging"));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL,