enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

simplify virtual desktops dialog: no need for advanced/basic dialog when using toolbok 

SVN revision: 56932
This commit is contained in:
Hannes Janetzek 2011-02-10 18:49:00 +00:00
parent 0a8b9a0380
commit dc87685c1e
1 changed files with 51 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
src/modules/conf_desks/e_int_config_desks.c
View File

@ -18,9 +18,6 @@ struct _E_Config_Dialog_Data
/*- BASIC -*/
int x;
int y;
int flip_animate;
/*- ADVANCED -*/
int edge_flip_dragging;
int flip_wrap;
int flip_mode;
@ -51,9 +48,9 @@ e_int_config_desks(E_Container *con, const char *params __UNUSED__)
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
v->basic.check_changed = _basic_check_changed;
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
v->advanced.check_changed = _advanced_check_changed;
v->advanced.apply_cfdata = NULL;
v->advanced.create_widgets = NULL;
v->advanced.check_changed = NULL;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Virtual Desktops Settings"),
"E", "screen/virtual_desktops",
@ -67,7 +64,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{
cfdata->x = e_config->zone_desks_x_count;
cfdata->y = e_config->zone_desks_y_count;
cfdata->flip_animate = e_config->desk_flip_animate_mode > 0;
cfdata->edge_flip_dragging = e_config->edge_flip_dragging;
cfdata->flip_wrap = e_config->desk_flip_wrap;
cfdata->flip_mode = e_config->desk_flip_animate_mode;
@ -96,6 +92,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
}
/**--APPLY--**/
static int
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
@ -110,63 +107,6 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
EINA_LIST_FOREACH(con->zones, lll, zone)
e_zone_desk_count_set(zone, cfdata->x, cfdata->y);
if (cfdata->flip_animate)
{
cfdata->flip_mode = 1;
e_config->desk_flip_animate_mode = 1;
}
if (!cfdata->flip_animate)
{
cfdata->flip_mode = 0;
e_config->desk_flip_animate_mode = 0;
}
e_config_save_queue();
return 1; /* Apply was OK */
}
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
const Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
EINA_LIST_FOREACH(e_manager_list(), l, man)
EINA_LIST_FOREACH(man->containers, ll, con)
EINA_LIST_FOREACH(con->zones, lll, zone)
{
int x, y;
e_zone_desk_count_get(zone, &x, &y);
if ((x != cfdata->x) || (y != cfdata->y))
return 1;
}
if ( (cfdata->flip_animate && (e_config->desk_flip_animate_mode == 0)) ||
(!cfdata->flip_animate && (e_config->desk_flip_animate_mode != 0)) )
return 1;
return 0;
}
static int
_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
/* Actually take our cfdata settings and apply them in real life */
const Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
EINA_LIST_FOREACH(e_manager_list(), l, man)
EINA_LIST_FOREACH(man->containers, ll, con)
EINA_LIST_FOREACH(con->zones, lll, zone)
e_zone_desk_count_set(zone, cfdata->x, cfdata->y);
cfdata->flip_animate = cfdata->flip_mode > 0;
e_config->desk_flip_animate_mode = cfdata->flip_mode;
e_config->desk_flip_animate_interpolation = cfdata->flip_interp;
e_config->desk_flip_pan_bg = cfdata->flip_pan_bg;
@ -182,7 +122,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
}
static int
_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
const Eina_List *l, *ll, *lll;
E_Manager *man;
@ -215,8 +155,11 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for a basic dialog */
Evas_Object *o, *ob, *of;
Evas_Object *o, *ob, *of, *otb;
E_Radio_Group *rg;
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
o = e_widget_list_add(evas, 0, 0);
of = e_widget_frametable_add(evas, _("Number of Desktops"), 0);
@ -238,97 +181,69 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Desktop Mouse Flip"), 0);
ob = e_widget_check_add(evas, _("Animated flip"), &(cfdata->flip_animate));
of = e_widget_framelist_add(evas, _("Desktop Flip"), 0);
ob = e_widget_check_add(evas, _("Flip when dragging objects to the screen edge"),
&(cfdata->edge_flip_dragging));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Wrap desktops around when flipping"),
&(cfdata->flip_wrap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);
return o;
}
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *otb, *ow, *o;
E_Radio_Group *rg;
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
o = e_widget_table_add(evas, 0);
ow = e_widget_deskpreview_add(evas, cfdata->x, cfdata->y);
e_widget_table_object_append(o, ow, 0, 0, 1, 1, 1, 1, 1, 1);
cfdata->preview = ow;
ow = e_widget_slider_add(evas, 0, 0, _("%1.0f"), 1, 12, 1, 0, NULL,
&(cfdata->y), 100);
e_widget_on_change_hook_set(ow, _cb_slider_change, cfdata);
e_widget_table_object_append(o, ow, 1, 0, 1, 1, 0, 1, 0, 1);
ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1, 12, 1, 0, NULL,
&(cfdata->x), 100);
e_widget_on_change_hook_set(ow, _cb_slider_change, cfdata);
e_widget_table_object_append(o, ow, 0, 1, 1, 1, 1, 0, 1, 0);
e_widget_toolbook_page_append(otb, NULL, _("Desktops"), o, 1, 1, 1, 1,
0.5, 0.0);
o = e_widget_list_add(evas, 0, 0);
ow = e_widget_check_add(evas, _("Flip when dragging objects to the screen edge"),
&(cfdata->edge_flip_dragging));
e_widget_list_object_append(o, ow, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Wrap desktops around when flipping"),
&(cfdata->flip_wrap));
e_widget_list_object_append(o, ow, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Desktop Mouse Flip"), o,
1, 0, 1, 0, 0.5, 0.0);
o = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->flip_mode));
ow = e_widget_radio_add(evas, _("Off"), 0, rg);
e_widget_on_change_hook_set(ow, _cb_disable_flip_anim, cfdata);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
ow = e_widget_radio_add(evas, _("Pane"), 1, rg);
e_widget_on_change_hook_set(ow, _cb_disable_flip_anim, cfdata);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
ow = e_widget_radio_add(evas, _("Zoom"), 2, rg);
e_widget_on_change_hook_set(ow, _cb_disable_flip_anim, cfdata);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
ob = e_widget_radio_add(evas, _("Off"), 0, rg);
e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_radio_add(evas, _("Pane"), 1, rg);
e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_radio_add(evas, _("Zoom"), 2, rg);
e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Background panning"),
ob = e_widget_check_add(evas, _("Background panning"),
&(cfdata->flip_pan_bg));
e_widget_disabled_set(ow, !cfdata->flip_mode);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ow);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
e_widget_disabled_set(ob, !cfdata->flip_mode);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ow = e_widget_label_add(evas, _("Animation speed"));
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ow);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
ow = e_widget_slider_add(evas, 1, 0, _("%1.1f sec"), 0, 5, 0.05, 0,
ob = e_widget_label_add(evas, _("Animation speed"));
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%1.1f sec"), 0, 5, 0.05, 0,
&(cfdata->flip_speed), NULL, 150);
e_widget_disabled_set(ow, !cfdata->flip_mode);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ow);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
e_widget_disabled_set(ob, !cfdata->flip_mode);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ow = e_widget_label_add(evas, _("X-Axis pan factor"));
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ow);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
ow = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0,
ob = e_widget_label_add(evas, _("X-Axis pan factor"));
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0,
&(cfdata->x_axis_pan), NULL, 150);
e_widget_disabled_set(ow, !cfdata->flip_mode);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ow);
e_widget_disabled_set(ob, !cfdata->flip_mode);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
ow = e_widget_label_add(evas, _("Y-Axis pan factor"));
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ow);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
ow = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0,
ob = e_widget_label_add(evas, _("Y-Axis pan factor"));
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%.2f"), 0, 1, 0.01, 0,
&(cfdata->y_axis_pan), NULL, 150);
e_widget_disabled_set(ow, !cfdata->flip_mode);
e_widget_list_object_append(o, ow, 1, 0, 0.5);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ow);
e_widget_disabled_set(ob, !cfdata->flip_mode);
e_widget_list_object_append(o, ob, 1, 0, 0.5);
cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
e_widget_toolbook_page_append(otb, NULL, _("Flip Animation"), o,
1, 0, 1, 0, 0.5, 0.0);
e_widget_toolbook_page_show(otb, 0);
return otb;
}