Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_shelf.c e_int_shelf_config.c e_shelf.c
Log Message:
patch from laurent for displaying shelf orientation in dialog (made the icons
smaller too)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_shelf.c 31 May 2006 18:58:26 -0000 1.7
+++ e_int_config_shelf.c 15 Jun 2006 13:09:21 -0000 1.8
@@ -72,6 +72,7 @@
{
Evas_List *l;
E_Shelf *es;
+ E_Config_Shelf *escfg;
char buf[256];
const char *label;
Evas_Object *ob;
@@ -83,6 +84,7 @@
for (l = e_shelf_list(); l; l = l->next)
{
es = l->data;
+ escfg = es->cfg;
label = es->name;
if (!label) label = "";
@@ -90,7 +92,49 @@
/* FIXME: proper icon */
ob = edje_object_add(evas_object_evas_get(cfdata->ilist));
- e_util_edje_icon_set(ob, "enlightenment/e");
+
+ 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");
+ break;
+ }
e_widget_ilist_append(cfdata->ilist, ob, buf, _cb_list, cfdata, NULL);
}
@@ -202,7 +246,7 @@
o = e_widget_list_add(evas, 0, 1);
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);
cfdata->ilist = oi;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_shelf_config.c 7 Jun 2006 21:42:13 -0000 1.13
+++ e_int_shelf_config.c 15 Jun 2006 13:09:21 -0000 1.14
@@ -206,7 +206,7 @@
o = e_widget_list_add(evas, 0, 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);
// ob = e_widget_check_add(evas, _("Expand width to fit contents"),
&(cfdata->fit_size));
// e_widget_framelist_object_append(of, ob);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_shelf.c 15 Jun 2006 07:24:10 -0000 1.28
+++ e_shelf.c 15 Jun 2006 13:09:21 -0000 1.29
@@ -719,7 +719,7 @@
E_Menu_Item *mi;
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_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es);
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
