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

remove tlist - really... hardly used. dubiously usefl as ilist does it just 

with added icons. use the icons anyway. less theme and code to maintain.



SVN revision: 36768
This commit is contained in:
Carsten Haitzler 2008-10-18 05:21:05 +00:00
parent 9efea75929
commit 51bceda65d
8 changed files with 5 additions and 929 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -97,7 +97,6 @@ src/bin/e_theme_about.c
src/bin/e_theme.c
src/bin/e_thumb.c
src/bin/e_thumb_main.c
src/bin/e_tlist.c
src/bin/e_toolbar.c
src/bin/e_user.c
src/bin/e_utils.c
@ -126,7 +125,6 @@ src/bin/e_widget_slider.c
src/bin/e_widget_spectrum.c
src/bin/e_widget_table.c
src/bin/e_widget_textblock.c
src/bin/e_widget_tlist.c
src/bin/e_win.c
src/bin/e_xinerama.c
src/bin/e_zone.c

4
src/bin/Makefile.am
View File

@ -108,10 +108,8 @@ e_eap_editor.h \
e_scrollframe.h \
e_int_border_menu.h \
e_ilist.h \
e_tlist.h \
e_livethumb.h \
e_widget_ilist.h \
e_widget_tlist.h \
e_widget_config_list.h \
e_slider.h \
e_widget_slider.h \
@ -248,10 +246,8 @@ e_eap_editor.c \
e_scrollframe.c \
e_int_border_menu.c \
e_ilist.c \
e_tlist.c \
e_livethumb.c \
e_widget_ilist.c \
e_widget_tlist.c \
e_widget_config_list.c \
e_slider.c \
e_widget_slider.c \

2
src/bin/e_includes.h
View File

@ -96,8 +96,6 @@
#include "e_stolen.h"
#include "e_gadcon.h"
#include "e_shelf.h"
#include "e_tlist.h"
#include "e_widget_tlist.h"
#include "e_widget_preview.h"
#include "e_int_shelf_config.h"
#include "e_int_gadcon_config.h"

543
src/bin/e_tlist.c
View File

@ -1,543 +0,0 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
/* FIXME: This should really be merged with ilist, but raster says not to hack ilist. */
#include "e.h"
#define SMART_NAME "e_tlist"
#define API_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))
#define INTERNAL_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return;
typedef struct _E_Smart_Data E_Smart_Data;
typedef struct _E_Smart_Item E_Smart_Item;
struct _E_Smart_Data
{
Evas_Coord x, y, w, h;
Evas_Object *smart_obj;
Evas_Object *box_obj;
Evas_List *items;
int selected;
unsigned char selector : 1;
unsigned char on_hold : 1;
};
struct _E_Smart_Item
{
E_Smart_Data *sd;
Evas_Object *base_obj;
void (*func) (void *data, void *data2);
void (*func_hilight) (void *data, void *data2);
void *data, *data2;
unsigned char markup:1;
};
/* local subsystem functions */
static void _e_tlist_append(Evas_Object * obj, const char *label,
void (*func) (void *data, void *data2),
void (*func_hilight) (void *data,
void *data2),
void *data, void *data2, int markup);
static void _e_smart_event_mouse_down(void *data, Evas * e,
Evas_Object * obj,
void *event_info);
static void _e_smart_event_mouse_up(void *data, Evas * e,
Evas_Object * obj,
void *event_info);
static void _e_smart_event_key_down(void *data, Evas * e,
Evas_Object * obj,
void *event_info);
static void _e_smart_reconfigure(E_Smart_Data * sd);
static void _e_smart_add(Evas_Object * obj);
static void _e_smart_del(Evas_Object * obj);
static void _e_smart_move(Evas_Object * obj, Evas_Coord x,
Evas_Coord y);
static void _e_smart_resize(Evas_Object * obj, Evas_Coord w,
Evas_Coord h);
static void _e_smart_show(Evas_Object * obj);
static void _e_smart_hide(Evas_Object * obj);
static void _e_smart_color_set(Evas_Object * obj, int r, int g, int b,
int a);
static void _e_smart_clip_set(Evas_Object * obj, Evas_Object * clip);
static void _e_smart_clip_unset(Evas_Object * obj);
static void _e_smart_init(void);
/* local subsystem globals */
static Evas_Smart *_e_smart = NULL;
/* externally accessible functions */
EAPI Evas_Object *
e_tlist_add(Evas *evas)
{
_e_smart_init();
return evas_object_smart_add(evas, _e_smart);
}
EAPI void
e_tlist_append(Evas_Object *obj, const char *label,
void (*func) (void *data, void *data2),
void (*func_hilight) (void *data, void *data2), void *data,
void *data2)
{
_e_tlist_append(obj, label, func, func_hilight, data, data2, 0);
}
EAPI void
e_tlist_markup_append(Evas_Object *obj, const char *label,
void (*func) (void *data, void *data2),
void (*func_hilight) (void *data, void *data2),
void *data, void *data2)
{
_e_tlist_append(obj, label, func, func_hilight, data, data2, 1);
}
EAPI void
e_tlist_selected_set(Evas_Object *obj, int n)
{
E_Smart_Item *si;
API_ENTRY return;
if (!sd->items) return;
if (n >= evas_list_count(sd->items))
n = evas_list_count(sd->items) - 1;
else if (n < 0)
n = 0;
if (sd->selected == n) return;
si = evas_list_nth(sd->items, sd->selected);
if (si)
edje_object_signal_emit(si->base_obj, "e,state,unselected", "e");
sd->selected = n;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
evas_object_raise(si->base_obj);
edje_object_signal_emit(si->base_obj, "e,state,selected", "e");
if (si->func_hilight) si->func_hilight(si->data, si->data2);
if (!sd->selector)
{
if (!sd->on_hold)
{
if (si->func) si->func(si->data, si->data2);
}
}
}
}
EAPI int
e_tlist_selected_get(Evas_Object *obj)
{
API_ENTRY return -1;
if (!sd->items) return -1;
return sd->selected;
}
EAPI const char *
e_tlist_selected_label_get(Evas_Object *obj)
{
E_Smart_Item *si;
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
if (si->markup)
return edje_object_part_text_get(si->base_obj, "e.textblock.label");
else
return edje_object_part_text_get(si->base_obj, "e.text.label");
}
return NULL;
}
EAPI void *
e_tlist_selected_data_get(Evas_Object *obj)
{
E_Smart_Item *si;
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, sd->selected);
if (si) return si->data;
return NULL;
}
EAPI void *
e_tlist_selected_data2_get(Evas_Object *obj)
{
E_Smart_Item *si;
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, sd->selected);
if (si) return si->data2;
return NULL;
}
EAPI void
e_tlist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y,
Evas_Coord *w, Evas_Coord *h)
{
E_Smart_Item *si;
API_ENTRY return;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
evas_object_geometry_get(si->base_obj, x, y, w, h);
*x -= sd->x;
*y -= sd->y;
}
}
EAPI void
e_tlist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
API_ENTRY return;
e_box_min_size_get(sd->box_obj, w, h);
}
EAPI void
e_tlist_selector_set(Evas_Object *obj, int selector)
{
API_ENTRY return;
sd->selector = selector;
}
EAPI int
e_tlist_selector_get(Evas_Object *obj)
{
API_ENTRY return 0;
return sd->selector;
}
EAPI void
e_tlist_remove_num(Evas_Object *obj, int n)
{
E_Smart_Item *si;
API_ENTRY return;
if (!sd->items) return;
si = evas_list_nth(sd->items, n);
if (si)
{
sd->items = evas_list_remove(sd->items, si);
if (e_tlist_selected_get(obj) == n) sd->selected = -1;
evas_object_del(si->base_obj);
free(si);
}
}
EAPI void
e_tlist_remove_label(Evas_Object *obj, const char *label)
{
E_Smart_Item *si;
Evas_List *l;
int i;
API_ENTRY return;
if (!sd->items) return;
if (!label) return;
for (i = 0, l = sd->items; l; l = l->next, i++)
{
si = l->data;
if (si)
{
char *t;
if (si->markup)
t = strdup(edje_object_part_text_get
(si->base_obj, "e.textblock.label"));
else
t = strdup(edje_object_part_text_get(si->base_obj,
"e.text.label"));
if (!strcmp(t, label))
{
evas_object_del(si->base_obj);
sd->items = evas_list_remove(sd->items, si);
free(si);
break;
}
free(t);
}
}
}
EAPI int
e_tlist_count(Evas_Object *obj)
{
API_ENTRY return 0;
return evas_list_count(sd->items);
}
EAPI void
e_tlist_clear(Evas_Object *obj)
{
INTERNAL_ENTRY;
while (sd->items)
{
E_Smart_Item *si;
si = sd->items->data;
sd->items = evas_list_remove_list(sd->items, sd->items);
evas_object_del(si->base_obj);
free(si);
}
sd->selected = -1;
}
/* local subsystem functions */
static void
_e_tlist_append(Evas_Object *obj, const char *label,
void (*func) (void *data, void *data2),
void (*func_hilight) (void *data, void *data2), void *data,
void *data2, int markup)
{
E_Smart_Item *si;
Evas_Coord mw = 0, mh = 0;
API_ENTRY return;
si = E_NEW(E_Smart_Item, 1);
si->sd = sd;
si->markup = markup;
si->base_obj = edje_object_add(evas_object_evas_get(sd->smart_obj));
/* FIXME: Use a color class or something to avoid duplicating the theme with only the background piccie being different. */
if (evas_list_count(sd->items) & 0x1)
e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"e/widgets/tlist_odd");
else
e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"e/widgets/tlist");
if (si->markup)
edje_object_part_text_set(si->base_obj, "e.textblock.label", label);
else
edje_object_part_text_set(si->base_obj, "e.text.label", label);
si->func = func;
si->func_hilight = func_hilight;
si->data = data;
si->data2 = data2;
sd->items = evas_list_append(sd->items, si);
edje_object_size_min_calc(si->base_obj, &mw, &mh);
e_box_pack_end(sd->box_obj, si->base_obj);
e_box_pack_options_set(si->base_obj, 1, 1, /* fill */
1, 1, /* expand */
0.5, 0.5, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
evas_object_lower(si->base_obj);
evas_object_event_callback_add(si->base_obj, EVAS_CALLBACK_MOUSE_DOWN,
_e_smart_event_mouse_down, si);
evas_object_event_callback_add(si->base_obj, EVAS_CALLBACK_MOUSE_UP,
_e_smart_event_mouse_up, si);
evas_object_show(si->base_obj);
}
static void
_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
Evas_Event_Mouse_Down *ev;
E_Smart_Item *si;
Evas_List *l;
int i;
si = data;
ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) si->sd->on_hold = 1;
else si->sd->on_hold = 0;
for (i = 0, l = si->sd->items; l; l = l->next, i++)
{
if (l->data == si)
{
e_tlist_selected_set(si->sd->smart_obj, i);
break;
}
}
}
static void
_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
Evas_Event_Mouse_Up *ev;
E_Smart_Item *si;
si = data;
ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) si->sd->on_hold = 1;
else si->sd->on_hold = 0;
if (si->sd->selector)
{
si = evas_list_nth(si->sd->items, si->sd->selected);
if (si)
{
if (!si->sd->on_hold)
{
if (si->func) si->func(si->data, si->data2);
}
}
}
si->sd->on_hold = 0;
}
static void
_e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
Evas_Event_Key_Down *ev;
E_Smart_Data *sd;
int n;
sd = data;
ev = event_info;
if (!strcmp(ev->keyname, "Up"))
{
n = e_tlist_selected_get(sd->smart_obj);
e_tlist_selected_set(sd->smart_obj, n - 1);
}
else if (!strcmp(ev->keyname, "Down"))
{
n = e_tlist_selected_get(sd->smart_obj);
e_tlist_selected_set(sd->smart_obj, n + 1);
}
else if ((!strcmp(ev->keyname, "Return")) ||
(!strcmp(ev->keyname, "space")))
{
if (!sd->on_hold)
{
E_Smart_Item *si;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
if (si->func) si->func(si->data, si->data2);
}
}
}
}
static void
_e_smart_reconfigure(E_Smart_Data *sd)
{
evas_object_move(sd->box_obj, sd->x, sd->y);
evas_object_resize(sd->box_obj, sd->w, sd->h);
}
static void
_e_smart_add(Evas_Object *obj)
{
E_Smart_Data *sd;
sd = calloc(1, sizeof(E_Smart_Data));
if (!sd) return;
evas_object_smart_data_set(obj, sd);
sd->smart_obj = obj;
sd->x = 0;
sd->y = 0;
sd->w = 0;
sd->h = 0;
sd->selected = -1;
sd->box_obj = e_box_add(evas_object_evas_get(obj));
e_box_align_set(sd->box_obj, 0.0, 0.0);
e_box_homogenous_set(sd->box_obj, 0);
evas_object_smart_member_add(sd->box_obj, obj);
evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN,
_e_smart_event_key_down, sd);
evas_object_propagate_events_set(obj, 0);
}
static void
_e_smart_del(Evas_Object *obj)
{
INTERNAL_ENTRY;
while (sd->items)
{
E_Smart_Item *si;
si = sd->items->data;
sd->items = evas_list_remove_list(sd->items, sd->items);
evas_object_del(si->base_obj);
free(si);
}
evas_object_del(sd->box_obj);
free(sd);
}
static void
_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
INTERNAL_ENTRY;
if ((sd->x == x) && (sd->y == y)) return;
sd->x = x;
sd->y = y;
_e_smart_reconfigure(sd);
}
static void
_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
INTERNAL_ENTRY;
if ((sd->w == w) && (sd->h == h)) return;
sd->w = w;
sd->h = h;
_e_smart_reconfigure(sd);
}
static void
_e_smart_show(Evas_Object *obj)
{
INTERNAL_ENTRY;
evas_object_show(sd->box_obj);
}
static void
_e_smart_hide(Evas_Object *obj)
{
INTERNAL_ENTRY;
evas_object_hide(sd->box_obj);
}
static void
_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
{
INTERNAL_ENTRY;
evas_object_color_set(sd->box_obj, r, g, b, a);
}
static void
_e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
{
INTERNAL_ENTRY;
evas_object_clip_set(sd->box_obj, clip);
}
static void
_e_smart_clip_unset(Evas_Object *obj)
{
INTERNAL_ENTRY;
evas_object_clip_unset(sd->box_obj);
}
/* never need to touch this */
static void
_e_smart_init(void)
{
if (_e_smart) return;
static const Evas_Smart_Class sc =
{
SMART_NAME,
EVAS_SMART_CLASS_VERSION,
_e_smart_add, _e_smart_del, _e_smart_move, _e_smart_resize,
_e_smart_show, _e_smart_hide, _e_smart_color_set,
_e_smart_clip_set, _e_smart_clip_unset, NULL, NULL
};
_e_smart = evas_smart_class_new(&sc);
}

41
src/bin/e_tlist.h
View File

@ -1,41 +0,0 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef E_TYPEDEFS
#else
#ifndef E_TLIST_H
#define E_TLIST_H
EAPI Evas_Object *e_tlist_add(Evas * evas);
EAPI void e_tlist_append(Evas_Object * obj, const char *label,
void (*func) (void *data, void *data2),
void (*func_hilight) (void *data,
void *data2),
void *data, void *data2);
EAPI void e_tlist_markup_append(Evas_Object * obj, const char *label,
void (*func) (void *data,
void *data2),
void (*func_hilight) (void *data,
void *data2),
void *data, void *data2);
EAPI void e_tlist_selected_set(Evas_Object * obj, int n);
EAPI int e_tlist_selected_get(Evas_Object * obj);
EAPI const char *e_tlist_selected_label_get(Evas_Object * obj);
EAPI void *e_tlist_selected_data_get(Evas_Object * obj);
EAPI void *e_tlist_selected_data2_get(Evas_Object * obj);
EAPI void e_tlist_selected_geometry_get(Evas_Object * obj,
Evas_Coord * x,
Evas_Coord * y,
Evas_Coord * w,
Evas_Coord * h);
EAPI void e_tlist_min_size_get(Evas_Object * obj, Evas_Coord * w,
Evas_Coord * h);
EAPI void e_tlist_selector_set(Evas_Object * obj, int selector);
EAPI int e_tlist_selector_get(Evas_Object * obj);
EAPI void e_tlist_remove_num(Evas_Object * obj, int n);
EAPI void e_tlist_remove_label(Evas_Object * obj, const char *label);
EAPI int e_tlist_count(Evas_Object * obj);
EAPI void e_tlist_clear(Evas_Object * obj);
#endif
#endif

304
src/bin/e_widget_tlist.c
View File

@ -1,304 +0,0 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
/* FIXME: This should really be merged with ilist, but raster says not to hack ilist. */
#include "e.h"
typedef struct _E_Widget_Data E_Widget_Data;
typedef struct _E_Widget_Callback E_Widget_Callback;
struct _E_Widget_Data
{
Evas_Object *o_widget, *o_scrollframe, *o_tlist;
Evas_List *callbacks;
char **value;
};
struct _E_Widget_Callback
{
void (*func) (void *data);
void *data;
char *value;
};
static void _e_widget_tlist_append(Evas_Object *obj, const char *label,
void (*func) (void *data),
void *data, const char *val,
int markup);
static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_focus_hook(Evas_Object *obj);
static void _e_wid_cb_scrollframe_resize(void *data, Evas *e,
Evas_Object *obj,
void *event_info);
static void _e_wid_cb_item_sel(void *data, void *data2);
static void _e_wid_cb_item_hilight(void *data, void *data2);
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj,
void *event_info);
/* externally accessible functions */
EAPI Evas_Object *
e_widget_tlist_add(Evas *evas, char **value)
{
Evas_Object *obj, *o;
E_Widget_Data *wd;
obj = e_widget_add(evas);
e_widget_del_hook_set(obj, _e_wid_del_hook);
e_widget_focus_hook_set(obj, _e_wid_focus_hook);
wd = calloc(1, sizeof(E_Widget_Data));
e_widget_data_set(obj, wd);
wd->value = value;
o = e_scrollframe_add(evas);
wd->o_scrollframe = o;
evas_object_show(o);
e_widget_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal, obj);
o = e_tlist_add(evas);
wd->o_tlist = o;
evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE,
_e_wid_cb_scrollframe_resize, o);
e_scrollframe_child_set(wd->o_scrollframe, o);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
evas_object_resize(obj, 32, 32);
e_widget_min_size_set(obj, 32, 32);
return obj;
}
EAPI void
e_widget_tlist_append(Evas_Object *obj, const char *label,
void (*func) (void *data), void *data, const char *val)
{
_e_widget_tlist_append(obj, label, func, data, val, 0);
}
EAPI void
e_widget_tlist_markup_append(Evas_Object *obj, const char *label,
void (*func) (void *data), void *data,
const char *val)
{
_e_widget_tlist_append(obj, label, func, data, val, 1);
}
EAPI void
e_widget_tlist_selected_set(Evas_Object *obj, int n)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_selected_set(wd->o_tlist, n);
}
EAPI int
e_widget_tlist_selected_get(Evas_Object *obj)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
return e_tlist_selected_get(wd->o_tlist);
}
EAPI const char *
e_widget_tlist_selected_label_get(Evas_Object *obj)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
return e_tlist_selected_label_get(wd->o_tlist);
}
EAPI void
e_widget_tlist_selector_set(Evas_Object *obj, int selector)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_selector_set(wd->o_tlist, selector);
}
EAPI void
e_widget_tlist_go(Evas_Object *obj)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
wd->o_widget = obj;
}
EAPI void
e_widget_tlist_remove_num(Evas_Object *obj, int n)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_remove_num(wd->o_tlist, n);
}
EAPI void
e_widget_tlist_remove_label(Evas_Object *obj, const char *label)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_remove_label(wd->o_tlist, label);
}
EAPI int
e_widget_tlist_count(Evas_Object *obj)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
return e_tlist_count(wd->o_tlist);
}
static void
_e_widget_tlist_append(Evas_Object *obj, const char *label,
void (*func) (void *data), void *data, const char *val,
int markup)
{
E_Widget_Data *wd;
Evas_Coord mw, mh, vw, vh, w, h;
E_Widget_Callback *wcb;
wd = e_widget_data_get(obj);
wcb = E_NEW(E_Widget_Callback, 1);
wcb->func = func;
wcb->data = data;
if (val) wcb->value = strdup(val);
wd->callbacks = evas_list_append(wd->callbacks, wcb);
if (markup)
e_tlist_markup_append(wd->o_tlist, label, _e_wid_cb_item_sel,
_e_wid_cb_item_hilight, wd, wcb);
else
e_tlist_append(wd->o_tlist, label, _e_wid_cb_item_sel,
_e_wid_cb_item_hilight, wd, wcb);
e_tlist_min_size_get(wd->o_tlist, &mw, &mh);
evas_object_resize(wd->o_tlist, mw, mh);
e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &w, &h);
if (mw > vw)
{
Evas_Coord wmw, wmh;
e_widget_min_size_get(obj, &wmw, &wmh);
e_widget_min_size_set(obj, mw + (w - vw), wmh);
}
else if (mw < vw)
evas_object_resize(wd->o_tlist, vw, mh);
}
EAPI void
e_widget_tlist_clear(Evas_Object *obj)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_clear(wd->o_tlist);
}
static void
_e_wid_del_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
while (wd->callbacks)
{
E_Widget_Callback *wcb;
wcb = wd->callbacks->data;
if (wcb->value) free(wcb->value);
free(wcb);
wd->callbacks = evas_list_remove_list(wd->callbacks, wd->callbacks);
}
free(wd);
}
static void
_e_wid_focus_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj))
{
edje_object_signal_emit(e_scrollframe_edje_object_get
(wd->o_scrollframe), "e,state,focused", "e");
evas_object_focus_set(wd->o_tlist, 1);
}
else
{
edje_object_signal_emit(e_scrollframe_edje_object_get
(wd->o_scrollframe), "e,state,unfocused", "e");
evas_object_focus_set(wd->o_tlist, 0);
}
}
static void
_e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
Evas_Coord mw, mh, vw, vh, w, h;
e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
e_tlist_min_size_get(data, &mw, &mh);
evas_object_geometry_get(data, NULL, NULL, &w, &h);
if (vw >= mw)
{
if (w != vw) evas_object_resize(data, vw, h);
}
}
static void
_e_wid_cb_item_sel(void *data, void *data2)
{
E_Widget_Data *wd;
Evas_Coord x, y, w, h;
E_Widget_Callback *wcb;
wd = data;
wcb = data2;
e_tlist_selected_geometry_get(wd->o_tlist, &x, &y, &w, &h);
e_scrollframe_child_region_show(wd->o_scrollframe, x, y, w, h);
if (wd->o_widget)
{
e_widget_change(wd->o_widget);
if (wd->value)
{
if (*(wd->value))
free(*(wd->value));
if (wcb->value)
*(wd->value) = strdup(wcb->value);
else
*(wd->value) = NULL;
}
if (wcb->func) wcb->func(wcb->data);
}
}
static void
_e_wid_cb_item_hilight(void *data, void *data2)
{
E_Widget_Data *wd;
Evas_Coord x, y, w, h;
E_Widget_Callback *wcb;
wd = data;
wcb = data2;
e_tlist_selected_geometry_get(wd->o_tlist, &x, &y, &w, &h);
e_scrollframe_child_region_show(wd->o_scrollframe, x, y, w, h);
}
static void
_e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
e_widget_focus_steal(data);
}

28
src/bin/e_widget_tlist.h
View File

@ -1,28 +0,0 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef E_TYPEDEFS
#else
#ifndef E_WIDGET_TLIST_H
#define E_WIDGET_TLIST_H
EAPI Evas_Object *e_widget_tlist_add(Evas * evas, char **value);
EAPI void e_widget_tlist_append(Evas_Object * obj, const char *label,
void (*func) (void *data), void *data,
const char *val);
EAPI void e_widget_tlist_markup_append(Evas_Object * obj, const char *label,
void (*func) (void *data),
void *data, const char *val);
EAPI void e_widget_tlist_selected_set(Evas_Object * obj, int n);
EAPI void e_widget_tlist_selector_set(Evas_Object * obj,
int selector);
EAPI void e_widget_tlist_go(Evas_Object * obj);
EAPI int e_widget_tlist_selected_get(Evas_Object * obj);
EAPI const char *e_widget_tlist_selected_label_get(Evas_Object * obj);
EAPI void e_widget_tlist_remove_num(Evas_Object * obj, int n);
EAPI void e_widget_tlist_remove_label(Evas_Object * obj, const char *label);
EAPI int e_widget_tlist_count(Evas_Object * obj);
EAPI void e_widget_tlist_clear(Evas_Object * obj);
#endif
#endif

10
src/modules/ibar/e_mod_config.c
View File

@ -99,7 +99,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_frametable_add(evas, _("Selected Bar Source"), 0);
ol = e_widget_tlist_add(evas, &(cfdata->dir));
ol = e_widget_ilist_add(evas, 32, 32, &(cfdata->dir));
cfdata->tlist = ol;
_load_tlist(cfdata);
e_widget_min_size_set(ol, 140, 140);
@ -265,7 +265,7 @@ _load_tlist(E_Config_Dialog_Data *cfdata)
char buf[4096], *file;
int selnum = -1;
e_widget_tlist_clear(cfdata->tlist);
e_widget_ilist_clear(cfdata->tlist);
home = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar", home);
@ -282,7 +282,7 @@ _load_tlist(E_Config_Dialog_Data *cfdata)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", home, file);
if (ecore_file_is_dir(buf))
{
e_widget_tlist_append(cfdata->tlist, file, NULL, NULL, file);
e_widget_ilist_append(cfdata->tlist, NULL, file, NULL, NULL, file);
if ((cfdata->dir) && (!strcmp(cfdata->dir, file)))
selnum = i;
i++;
@ -290,9 +290,9 @@ _load_tlist(E_Config_Dialog_Data *cfdata)
}
ecore_list_destroy(dirs);
}
e_widget_tlist_go(cfdata->tlist);
e_widget_ilist_go(cfdata->tlist);
if (selnum >= 0)
e_widget_tlist_selected_set(cfdata->tlist, selnum);
e_widget_ilist_selected_set(cfdata->tlist, selnum);
}
static void