forked from enlightenment/enlightenment
patch from laurent for displaying shelf orientation in dialog (made the icons
smaller too) SVN revision: 23447
This commit is contained in:
parent
01ffb0e77b
commit
3986e8d184
|
@ -72,6 +72,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
Evas_List *l;
|
Evas_List *l;
|
||||||
E_Shelf *es;
|
E_Shelf *es;
|
||||||
|
E_Config_Shelf *escfg;
|
||||||
char buf[256];
|
char buf[256];
|
||||||
const char *label;
|
const char *label;
|
||||||
Evas_Object *ob;
|
Evas_Object *ob;
|
||||||
|
@ -83,6 +84,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
|
||||||
for (l = e_shelf_list(); l; l = l->next)
|
for (l = e_shelf_list(); l; l = l->next)
|
||||||
{
|
{
|
||||||
es = l->data;
|
es = l->data;
|
||||||
|
escfg = es->cfg;
|
||||||
|
|
||||||
label = es->name;
|
label = es->name;
|
||||||
if (!label) label = "";
|
if (!label) label = "";
|
||||||
|
@ -90,7 +92,49 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
|
||||||
|
|
||||||
/* FIXME: proper icon */
|
/* FIXME: proper icon */
|
||||||
ob = edje_object_add(evas_object_evas_get(cfdata->ilist));
|
ob = edje_object_add(evas_object_evas_get(cfdata->ilist));
|
||||||
|
|
||||||
|
switch(escfg->orient)
|
||||||
|
{
|
||||||
|
case E_GADCON_ORIENT_LEFT:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_left");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_right");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_TOP:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_top");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_bottom");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_TL:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_top_left");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_TR:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_top_right");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_BL:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_bottom_left");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_BR:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_bottom_right");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_LT:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_left_top");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_RT:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_right_top");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_LB:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_left_bottom");
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_RB:
|
||||||
|
e_util_edje_icon_set(ob, "enlightenment/shelf_position_right_bottom");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
e_util_edje_icon_set(ob, "enlightenment/e");
|
e_util_edje_icon_set(ob, "enlightenment/e");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
e_widget_ilist_append(cfdata->ilist, ob, buf, _cb_list, cfdata, NULL);
|
e_widget_ilist_append(cfdata->ilist, ob, buf, _cb_list, cfdata, NULL);
|
||||||
}
|
}
|
||||||
|
@ -202,7 +246,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
o = e_widget_list_add(evas, 0, 1);
|
o = e_widget_list_add(evas, 0, 1);
|
||||||
|
|
||||||
of = e_widget_framelist_add(evas, _("Configured Shelves"), 0);
|
of = e_widget_framelist_add(evas, _("Configured Shelves"), 0);
|
||||||
oi = e_widget_ilist_add(evas, 80, 60, NULL);
|
oi = e_widget_ilist_add(evas, 24, 24, NULL);
|
||||||
e_widget_ilist_selector_set(oi, 1);
|
e_widget_ilist_selector_set(oi, 1);
|
||||||
cfdata->ilist = oi;
|
cfdata->ilist = oi;
|
||||||
|
|
||||||
|
|
|
@ -206,7 +206,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
o = e_widget_list_add(evas, 0, 0);
|
o = e_widget_list_add(evas, 0, 0);
|
||||||
|
|
||||||
of = e_widget_framelist_add(evas, _("Size"), 0);
|
of = e_widget_framelist_add(evas, _("Size"), 0);
|
||||||
ob = e_widget_check_add(evas, _("Shrink to Content Size"), &(cfdata->fit_along));
|
ob = e_widget_check_add(evas, _("Shrink"), &(cfdata->fit_along));
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
// ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size));
|
// ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size));
|
||||||
// e_widget_framelist_object_append(of, ob);
|
// e_widget_framelist_object_append(of, ob);
|
||||||
|
|
|
@ -719,7 +719,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
|
||||||
E_Menu_Item *mi;
|
E_Menu_Item *mi;
|
||||||
|
|
||||||
mi = e_menu_item_new(mn);
|
mi = e_menu_item_new(mn);
|
||||||
e_menu_item_label_set(mi, _("Shelf Location and Appearance Settings"));
|
e_menu_item_label_set(mi, _("Shelf Configuration"));
|
||||||
e_util_menu_item_edje_icon_set(mi, "enlightenment/config");
|
e_util_menu_item_edje_icon_set(mi, "enlightenment/config");
|
||||||
e_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es);
|
e_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue