From 3986e8d184c1e391ba77aa9a6131af68edb7e478 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 15 Jun 2006 13:09:21 +0000
Subject: [PATCH] patch from laurent for displaying shelf orientation in dialog
 (made the icons smaller too)

SVN revision: 23447
---
 src/bin/e_int_config_shelf.c | 48 ++++++++++++++++++++++++++++++++++--
 src/bin/e_int_shelf_config.c |  2 +-
 src/bin/e_shelf.c            |  2 +-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_int_config_shelf.c b/src/bin/e_int_config_shelf.c
index 1b9b3c854..c1c44d374 100644
--- a/src/bin/e_int_config_shelf.c
+++ b/src/bin/e_int_config_shelf.c
@@ -72,6 +72,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
 {
    Evas_List *l;
    E_Shelf *es;
+   E_Config_Shelf *escfg;
    char buf[256];
    const char *label;
    Evas_Object *ob;
@@ -83,6 +84,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
    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 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
 	
 	/* 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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    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;
 
diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index 46c9d8aa5..ef21db3ec 100644
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -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);
    
    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);
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index fa4b996f9..5040ef8e8 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -719,7 +719,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
    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);