enlightenment
/
enlightenment-module-places
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Places: use an edje box instead of e_box 

SVN revision: 84513
This commit is contained in:
Davide Andreoli 2013-04-20 16:36:01 +00:00 committed by Tom Hacohen
parent 2c717c0aff
commit 678fa102cc
5 changed files with 139 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
e-module-places.edc
View File

@ -33,11 +33,53 @@ collections
}
}
/****************************************************/
/** GADGET MAIN BOX *******************************/
/****************************************************/
group { name: "modules/places/main";
parts {
// part { name: "DEBUG";
// type: RECT;
// description { state: "default" 0.0;
// color: 200 0 0 100;
// }
// }
part { name: "box";
type: BOX;
description { state: "default" 0.0;
box {
layout: "vertical";
align: 0.5 0.0;
}
}
description { state: "horiz" 0.0;
box {
layout: "orizontal";
align: 0.5 0.5;
}
}
}
}
programs {
program { name: "set_box_horiz";
signal: "box,set,horiz";
source: "places";
action: STATE_SET "horiz" 0.0;
target: "box";
}
program { name: "set_box_vert";
signal: "box,set,vert";
source: "places";
action: STATE_SET "default" 0.0;
target: "box";
}
}
}
/****************************************************/
/** GADGET HEADER *********************************/
/****************************************************/
group { name: "modules/places/header";
min: 120 35;
max: 384 60;
max: 384 35;
parts {
part { name: "bg";
mouse_events: 1;
@ -99,8 +141,9 @@ collections
}
description { state: "vert" 0.0;
rel1.relative: 1.0 0.0;
rel2.relative: 1.0 0.0;
rel2.offset: 0 50;
rel2.relative: 1.0 1.0;
rel2.offset: 0 0;
color: 0 0 0 100;
color: 0 0 0 100;
}
}
@ -210,7 +253,7 @@ collections
description { state: "vert" 0.0;
rel1.relative: 1.0 0.0;
rel2.relative: 1.0 1.0;
rel2.offset: 0 47;
rel2.offset: 0 0;
color: 0 0 0 100;
}
}
@ -240,8 +283,8 @@ collections
/****************************************************/
/** GADGET VOLUME *********************************/
/****************************************************/
group { name: "modules/places/main";
min: 90 50;
group { name: "modules/places/volume";
min: 150 50;
max: 384 50;
script { /* this set the gauge value */
public message(Msg_Type:type, id, ...) {

40
src/e_mod_main.c
View File

@ -202,19 +202,21 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
inst = E_NEW(Instance, 1);
inst->conf_item = _places_conf_item_get(id);
inst->o_box = e_box_add(gc->evas);
e_box_homogenous_set(inst->o_box, 0);
e_box_orientation_set(inst->o_box, 0);
e_box_align_set(inst->o_box, 0.0, 0.0);
if (1) // site is desktop
{
inst->o_main = places_main_obj_create(gc->evas);
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_MOUSE_DOWN,
_places_cb_mouse_down, inst);
inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_main);
places_fill_box(inst->o_main, EINA_FALSE);
}
else
{
// TODO site is shelf or toolbar
}
inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_box);
inst->gcc->data = inst;
evas_object_event_callback_add(inst->o_box, EVAS_CALLBACK_MOUSE_DOWN,
_places_cb_mouse_down, inst);
instances = eina_list_append(instances, inst);
places_fill_box(inst->o_box);
return inst->gcc;
}
@ -234,12 +236,12 @@ _gc_shutdown(E_Gadcon_Client *gcc)
inst->menu = NULL;
}
if (inst->o_box)
if (inst->o_main)
{
evas_object_event_callback_del(inst->o_box, EVAS_CALLBACK_MOUSE_DOWN,
evas_object_event_callback_del(inst->o_main, EVAS_CALLBACK_MOUSE_DOWN,
_places_cb_mouse_down);
places_empty_box(inst->o_box);
evas_object_del(inst->o_box);
places_empty_box(inst->o_main);
evas_object_del(inst->o_main);
}
E_FREE(inst);
@ -267,9 +269,9 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
// TODO get sizes from the theme
e_gadcon_client_aspect_set(gcc, 100 * count, 60);
e_gadcon_client_min_size_set(gcc, 100 * count, 60);
e_box_orientation_set(inst->o_box, 1);
e_gadcon_client_aspect_set(gcc, 200 * count, 60);
e_gadcon_client_min_size_set(gcc, 200 * count, 60);
inst->horiz = EINA_TRUE;
break;
case E_GADCON_ORIENT_FLOAT:
case E_GADCON_ORIENT_VERT:
@ -282,13 +284,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
// TODO get sizes from the theme
e_gadcon_client_aspect_set(gcc, 200, 50 * count);
e_gadcon_client_min_size_set(gcc, 200, 50 * count);
e_box_orientation_set(inst->o_box, 0);
inst->horiz = EINA_FALSE;
break;
default:
break;
}
places_fill_box(inst->o_box);
places_fill_box(inst->o_main, inst->horiz);
}
static const char *

3
src/e_mod_main.h
View File

@ -54,7 +54,8 @@ typedef struct _Instance Instance;
struct _Instance
{
E_Gadcon_Client *gcc;
Evas_Object *o_box;
Evas_Object *o_main;
Eina_Bool horiz;
E_Menu *menu;
Config_Item *conf_item;
};

123
src/e_mod_places.c
View File

@ -75,6 +75,17 @@ places_shutdown(void)
#endif
}
Evas_Object *
places_main_obj_create(Evas *canvas)
{
Evas_Object *o;
o = edje_object_add(canvas);
edje_object_file_set(o, theme_file, "modules/places/main");
return o;
}
Eina_List *
places_volume_list_get(void)
{
@ -120,6 +131,8 @@ places_volume_del(Volume *v)
{
Evas_Object *o;
Evas_Object *swal;
Eina_List *l;
Instance *inst;
if (v->free_func)
v->free_func(v);
@ -134,7 +147,9 @@ places_volume_del(Volume *v)
evas_object_del(swal);
}
e_box_unpack(o);
EINA_LIST_FOREACH(instances, l, inst)
edje_object_part_box_remove(inst->o_main, "box", o);
evas_object_del(o);
}
if (v->id) eina_stringshare_del(v->id);
@ -148,8 +163,7 @@ places_volume_del(Volume *v)
if (v->model) eina_stringshare_del(v->model);
if (v->vendor) eina_stringshare_del(v->vendor);
if (v->serial) eina_stringshare_del(v->serial);
free(v);
E_FREE(v);
}
Volume *
@ -191,7 +205,7 @@ places_update_all_gadgets(void)
volumes = eina_list_sort(volumes, 0, _places_volume_sort_cb);
EINA_LIST_FOREACH(instances, l, inst)
places_fill_box(inst->o_box);
places_fill_box(inst->o_main, inst->horiz);
}
void
@ -219,7 +233,7 @@ places_volume_update(Volume *vol)
}
void
places_fill_box(Evas_Object *box)
places_fill_box(Evas_Object *main, Eina_Bool horiz)
{
Eina_List *l;
int min_w, min_h, max_w, max_h, found;
@ -227,7 +241,7 @@ places_fill_box(Evas_Object *box)
char *f1, *f2, *f3;
char buf[128];
places_empty_box(box);
places_empty_box(main);
/*if (places_conf->show_home)
_places_custom_volume(box, D_("Home"), "e/icons/fileman/home", "/home/dave");
@ -241,29 +255,33 @@ places_fill_box(Evas_Object *box)
_places_custom_volume(box, D_("Temp"), "e/icons/fileman/tmp", "/tmp");
*/
// orient the edje box
if (horiz)
edje_object_signal_emit(main, "box,set,horiz", "places");
else
edje_object_signal_emit(main, "box,set,vert", "places");
o = edje_object_add(evas_object_evas_get(box));
// header (or just a separator if header is not wanted)
o = edje_object_add(evas_object_evas_get(main));
if (places_conf->hide_header)
edje_object_file_set(o, theme_file, "modules/places/separator");
else
edje_object_file_set(o, theme_file, "modules/places/header");
edje_object_part_text_set(o, "label", D_("Places"));
if (!e_box_orientation_get(box))
edje_object_signal_emit(o, "separator,set,horiz", "places");
else
if (horiz)
edje_object_signal_emit(o, "separator,set,vert", "places");
else
edje_object_signal_emit(o, "separator,set,horiz", "places");
edje_object_size_min_get(o, &min_w, &min_h);
edje_object_size_max_get(o, &max_w, &max_h);
evas_object_size_hint_min_set(o, min_w, min_h);
evas_object_size_hint_max_set(o, max_w, max_h);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
edje_object_part_box_append(main, "box", o);
evas_object_show(o);
e_box_pack_end(box, o);
e_box_pack_options_set(o,
1, 0, /* fill */
0, 0, /* expand */
0.5, 0.0, /* align */
min_w, min_h, /* min */
max_w, max_h /* max */
);
edje_object_signal_callback_add(o, "header,activated", "places",
_places_header_activated_cb, NULL);
@ -275,12 +293,12 @@ places_fill_box(Evas_Object *box)
if (!vol->valid) continue;
//volume object
o = edje_object_add(evas_object_evas_get(box));
edje_object_file_set(o, theme_file, "modules/places/main");
o = edje_object_add(evas_object_evas_get(main));
edje_object_file_set(o, theme_file, "modules/places/volume");
vol->objs = eina_list_append(vol->objs, o);
//choose the right icon
icon = e_icon_add(evas_object_evas_get(box));
icon = e_icon_add(evas_object_evas_get(main));
f1 = f2 = f3 = NULL;
/* optical discs */
if (!strcmp(vol->drive_type, "cdrom") ||
@ -352,10 +370,10 @@ places_fill_box(Evas_Object *box)
_places_volume_object_update(vol, o);
// orient the separator
if (!e_box_orientation_get(box))
edje_object_signal_emit(o, "separator,set,horiz", "places");
else
if (horiz)
edje_object_signal_emit(o, "separator,set,vert", "places");
else
edje_object_signal_emit(o, "separator,set,horiz", "places");
// connect signals from edje
edje_object_signal_callback_add(o, "icon,activated", "places",
@ -364,50 +382,39 @@ places_fill_box(Evas_Object *box)
_places_eject_activated_cb, vol);
// pack the volume in the box
evas_object_show(o);
edje_object_size_min_get(o, &min_w, &min_h);
edje_object_size_max_get(o, &max_w, &max_h);
e_box_pack_end(box, o);
e_box_pack_options_set(o,
1, 0, /* fill */
1, 0, /* expand */
0.5, 0.0, /* align */
min_w, min_h, /* min */
max_w, max_h /* max */
);
evas_object_size_hint_min_set(o, min_w, min_h);
evas_object_size_hint_max_set(o, max_w, max_h);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
edje_object_part_box_append(main, "box", o);
evas_object_show(o);
}
}
void
places_empty_box(Evas_Object *box)
places_empty_box(Evas_Object *main)
{
int count;
Evas_Object *o;
e_box_freeze(box);
count = e_box_pack_count_get(box);
while (count >= 0)
{
Volume *vol;
Eina_List *l;
Evas_Object *o, *swal;
while ((o = edje_object_part_box_remove_at(main, "box", 0)))
{
Volume *vol;
Evas_Object *swal;
Eina_List *l;
o = e_box_pack_object_nth(box, count);
swal = edje_object_part_swallow_get(o, "icon");
if (swal)
{
edje_object_part_unswallow(o, swal);
evas_object_del(swal);
}
swal = edje_object_part_swallow_get(o, "icon");
if (swal)
{
edje_object_part_unswallow(o, swal);
evas_object_del(swal);
}
EINA_LIST_FOREACH(volumes, l, vol)
vol->objs = eina_list_remove(vol->objs, o);
EINA_LIST_FOREACH(volumes, l, vol)
vol->objs = eina_list_remove(vol->objs, o);
e_box_unpack(o);
evas_object_del(o);
count--;
}
e_box_thaw(box);
evas_object_del(o);
}
}
void
@ -480,7 +487,7 @@ _places_custom_volume(Evas_Object *box, const char *label, const char *icon, con
/* volume object */
o = edje_object_add(evas_object_evas_get(box));
edje_object_file_set(o, theme_file, "modules/places/main");
edje_object_file_set(o, theme_file, "modules/places/volume");
/* icon */
i = edje_object_add(evas_object_evas_get(box));

3
src/e_mod_places.h
View File

@ -57,8 +57,9 @@ void places_volume_mount(Volume *vol);
void places_volume_unmount(Volume *vol);
void places_volume_eject(Volume *vol);
Evas_Object *places_main_obj_create(Evas *canvas);
void places_update_all_gadgets(void);
void places_fill_box(Evas_Object *box);
void places_fill_box(Evas_Object *box, Eina_Bool horiz);
void places_empty_box(Evas_Object *box);
void places_print_volume(Volume *v);