vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Gadcon API 3 *BREAK*

Browse Source 
Version 3 add the *client_class param to icon(),label(),id_new(), id_del() 
 and the *orient param to orient().

All the modules (with a gadcon_client) need to be fixed...just add the new params 

to follow the EXTRA modules update.

SVN revision: 37450
devs/princeamd/enlightenment-0.17-elive
Davide Andreoli 15 years ago
parent 3ec28b3664
commit 45cbf72298
30 changed files with 3486 additions and 3265 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 560
      po/bg.po
  2. 560
      po/ca.po
  3. 560
      po/de.po
  4. 560
      po/eo.po
  5. 560
      po/es.po
  6. 560
      po/fi.po
  7. 1924
      po/fr.po
  8. 560
      po/fr_CH.po
  9. 560
      po/hu.po
  10. 18
      src/bin/e_gadcon.c
  11. 14
      src/bin/e_gadcon.h
  12. 12
      src/bin/e_int_gadcon_config.c
  13. 16
      src/modules/battery/e_mod_main.c
  14. 16
      src/modules/clock/e_mod_main.c
  15. 16
      src/modules/connman/e_mod_main.c
  16. 16
      src/modules/cpufreq/e_mod_main.c
  17. 4
      src/modules/gadman/e_mod_config.c
  18. 2
      src/modules/gadman/e_mod_gadman.c
  19. 40
      src/modules/ibar/e_mod_main.c
  20. 45
      src/modules/ibox/e_mod_main.c
  21. 4
      src/modules/illume/e_cfg.c
  22. 16
      src/modules/illume/e_mod_gad_bluetooth.c
  23. 16
      src/modules/illume/e_mod_gad_cfg.c
  24. 16
      src/modules/illume/e_mod_gad_gsm.c
  25. 16
      src/modules/illume/e_mod_gad_usb.c
  26. 16
      src/modules/illume/e_mod_gad_wifi.c
  27. 8
      src/modules/mixer/e_mod_main.c
  28. 20
      src/modules/pager/e_mod_main.c
  29. 16
      src/modules/start/e_mod_main.c
  30. 20
      src/modules/temperature/e_mod_main.c

560
po/bg.po
View File

File diff suppressed because it is too large Load Diff

560
po/ca.po
View File

File diff suppressed because it is too large Load Diff

560
po/de.po
View File

File diff suppressed because it is too large Load Diff

560
po/eo.po
View File

File diff suppressed because it is too large Load Diff

560
po/es.po
View File

File diff suppressed because it is too large Load Diff

560
po/fi.po
View File

File diff suppressed because it is too large Load Diff

1924
po/fr.po
View File

File diff suppressed because it is too large Load Diff

560
po/fr_CH.po
View File

File diff suppressed because it is too large Load Diff

560
po/hu.po
View File

File diff suppressed because it is too large Load Diff

18
src/bin/e_gadcon.c
Unescape View File

@ -388,7 +388,7 @@ e_gadcon_populate(E_Gadcon *gc)
if ((!cf_gcc->id) &&
(_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)))
cf_gcc->id = eina_stringshare_add(cc->func.id_new());
cf_gcc->id = eina_stringshare_add(cc->func.id_new(cc));
if (!cf_gcc->style)
{
@ -416,7 +416,7 @@ e_gadcon_populate(E_Gadcon *gc)
e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
if (gcc->client_class->func.orient)
gcc->client_class->func.orient(gcc);
gcc->client_class->func.orient(gcc, gc->orient);
_e_gadcon_client_save(gcc);
if (gc->editing) e_gadcon_client_edit_begin(gcc);
@ -470,7 +470,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
if ((!cf_gcc->id) &&
(_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)))
cf_gcc->id = eina_stringshare_add(cc->func.id_new());
cf_gcc->id = eina_stringshare_add(cc->func.id_new(cc));
gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id,
cf_gcc->style);
@ -489,7 +489,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
if (gcc->client_class->func.orient)
gcc->client_class->func.orient(gcc);
gcc->client_class->func.orient(gcc, gc->orient);
_e_gadcon_client_save(gcc);
if (gc->editing) e_gadcon_client_edit_begin(gcc);
@ -544,7 +544,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
gcc = l->data;
e_box_orientation_set(gcc->o_box, horiz);
if (gcc->client_class->func.orient)
gcc->client_class->func.orient(gcc);
gcc->client_class->func.orient(gcc, gc->orient);
}
e_gadcon_layout_thaw(gc->o_container);
}
@ -748,7 +748,7 @@ e_gadcon_client_config_new(E_Gadcon *gc, const char *name)
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1);
if (!cf_gcc) return NULL;
cf_gcc->name = eina_stringshare_add(name);
cf_gcc->id = eina_stringshare_add(cc->func.id_new());
cf_gcc->id = eina_stringshare_add(cc->func.id_new(cc));
cf_gcc->geom.res = 800;
cf_gcc->geom.size = 80;
cf_gcc->geom.pos = cf_gcc->geom.res - cf_gcc->geom.size;
@ -1377,7 +1377,7 @@ _e_gadcon_client_free(E_Gadcon_Client *gcc)
e_gadcon_client_edit_end(gcc);
gcc->client_class->func.shutdown(gcc);
if (gcc->client_class->func.id_del)
gcc->client_class->func.id_del(gcc->cf->id);
gcc->client_class->func.id_del(gcc->client_class, gcc->cf->id);
gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc);
if (gcc->o_box) evas_object_del(gcc->o_box);
if (gcc->o_frame) evas_object_del(gcc->o_frame);
@ -1530,7 +1530,7 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
_e_gadcon_cb_drag_finished);
if (drag)
{
o = gcc->client_class->func.icon(drag->evas);
o = gcc->client_class->func.icon(gcc->client_class, drag->evas);
evas_object_geometry_get(o, NULL, NULL, &w, &h);
if (!o)
{
@ -2142,7 +2142,7 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event)
e_gadcon_client_autoscroll_set(new_gcc, gcc->autoscroll);
e_gadcon_client_resizable_set(new_gcc, gcc->resizable);
if (new_gcc->client_class->func.orient)
new_gcc->client_class->func.orient(new_gcc);
new_gcc->client_class->func.orient(new_gcc, gc->orient);
new_gcc->state_info.resist = 1;
if (gc->instant_edit)
e_gadcon_client_util_menu_attach(new_gcc);

14
src/bin/e_gadcon.h
Unescape View File

@ -98,7 +98,9 @@ struct _E_Gadcon
unsigned char instant_edit : 1;
};
#define GADCON_CLIENT_CLASS_VERSION 2
#define GADCON_CLIENT_CLASS_VERSION 3
/* Version 3 add the *client_class param to icon(),label(),id_new(), id_del() */
/* and the *orient param to orient() */
struct _E_Gadcon_Client_Class
{
int version;
@ -108,14 +110,14 @@ struct _E_Gadcon_Client_Class
{
E_Gadcon_Client *(*init) (E_Gadcon *gc, const char *name, const char *id, const char *style);
void (*shutdown) (E_Gadcon_Client *gcc);
void (*orient) (E_Gadcon_Client *gcc);
char *(*label) (void);
Evas_Object *(*icon) (Evas *evas);
void (*orient) (E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
char *(*label) (E_Gadcon_Client_Class *client_class);
Evas_Object *(*icon) (E_Gadcon_Client_Class *client_class, Evas *evas);
/* All members below are part of version 2 */
/* Create new id, so that the gadcon client can refer to a config set inside the module */
const char *(*id_new) (void);
const char *(*id_new) (E_Gadcon_Client_Class *client_class);
/* Del an id when a gadcon client is removed from the system */
void (*id_del) (const char *id);
void (*id_del) (E_Gadcon_Client_Class *client_class, const char *id);
/* All members below are part of version 3 */
} func;
char *default_style;

12
src/bin/e_int_gadcon_config.c
Unescape View File

@ -207,9 +207,9 @@ _load_avail_gadgets(void *data)
const char *lbl = NULL;
if (!(cc = l->data)) continue;
if (cc->func.label) lbl = cc->func.label();
if (cc->func.label) lbl = cc->func.label(cc);
if (!lbl) lbl = cc->name;
if (cc->func.icon) icon = cc->func.icon(evas);
if (cc->func.icon) icon = cc->func.icon(cc, evas);
e_widget_ilist_append(cfdata->o_avail, icon, lbl, NULL,
(void *)cc->name, NULL);
}
@ -251,9 +251,9 @@ _load_sel_gadgets(void *data)
if ((cgc->name) && (gcc->name) &&
(!strcmp(cgc->name, gcc->name)))
{
if (gcc->func.label) lbl = gcc->func.label();
if (gcc->func.label) lbl = gcc->func.label(gcc);
if (!lbl) lbl = gcc->name;
if (gcc->func.icon) icon = gcc->func.icon(evas);
if (gcc->func.icon) icon = gcc->func.icon(gcc, evas);
e_widget_ilist_append(cfdata->o_sel, icon, lbl, NULL,
(void *)gcc->name, NULL);
}
@ -370,10 +370,10 @@ _gad_list_sort(void *data1, void *data2)
if (!(cc = data1)) return 1;
if (!(cc2 = data2)) return -1;
if (cc->func.label) lbl1 = cc->func.label();
if (cc->func.label) lbl1 = cc->func.label(cc);
if (!lbl1) lbl1 = cc->name;
if (cc2->func.label) lbl2 = cc2->func.label();
if (cc2->func.label) lbl2 = cc2->func.label(cc2);
if (!lbl2) lbl2 = cc2->name;
return (strcmp(lbl1, lbl2));

16
src/modules/battery/e_mod_main.c
Unescape View File

@ -9,10 +9,10 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
@ -106,7 +106,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -125,13 +125,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _("Battery");
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
char buf[4096];
@ -144,7 +144,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

16
src/modules/clock/e_mod_main.c
Unescape View File

@ -9,10 +9,10 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -76,7 +76,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh;
@ -93,13 +93,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _("Clock");
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
char buf[4096];
@ -112,7 +112,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

16
src/modules/connman/e_mod_main.c
Unescape View File

@ -26,10 +26,10 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -191,7 +191,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh;
@ -208,13 +208,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _("Connection Manager");
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
char buf[4096];
@ -227,7 +227,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

16
src/modules/cpufreq/e_mod_main.c
Unescape View File

@ -14,10 +14,10 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -115,7 +115,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
@ -125,13 +125,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _("Cpufreq");
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
char buf[4096];
@ -144,7 +144,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

4
src/modules/gadman/e_mod_config.c
Unescape View File

@ -294,9 +294,9 @@ _fill_gadgets_list(Evas_Object *ilist)
const char *lbl = NULL;
if (!(cc = l->data)) continue;
if (cc->func.label) lbl = cc->func.label();
if (cc->func.label) lbl = cc->func.label(cc);
if (!lbl) lbl = cc->name;
if (cc->func.icon) icon = cc->func.icon(Man->gc->evas);
if (cc->func.icon) icon = cc->func.icon(cc, Man->gc->evas);
e_widget_ilist_append(ilist, icon, lbl, NULL, (void *)cc, NULL);
}

2
src/modules/gadman/e_mod_gadman.c
Unescape View File

@ -179,7 +179,7 @@ gadman_gadget_place(E_Config_Gadcon_Client *cf, int ontop)
/* Call the client orientation function */
if (cc->func.orient)
cc->func.orient(gcc);
cc->func.orient(gcc, E_GADCON_ORIENT_FLOAT); //TODO make this configurable per instance
return gcc;
}

40
src/modules/ibar/e_mod_main.c
Unescape View File

@ -11,11 +11,11 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_id_del(const char *id);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
@ -171,12 +171,12 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
inst = gcc->data;
switch (gcc->gadcon->orient)
switch (orient)
{
case E_GADCON_ORIENT_FLOAT:
case E_GADCON_ORIENT_HORIZ:
@ -206,13 +206,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _("IBar");
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
char buf[4096];
@ -225,7 +225,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
Config_Item *ci;
@ -234,7 +234,7 @@ _gc_id_new(void)
}
static void
_gc_id_del(const char *id)
_gc_id_del(E_Gadcon_Client_Class *client_class, const char *id)
{
/* yes - don't do this. on shutdown gadgets are deleted and this means config
* for them is deleted - that means empty config is saved. keep them around
@ -510,7 +510,7 @@ _ibar_config_update(Config_Item *ci)
inst->ibar->apps = e_order_new(buf);
_ibar_fill(inst->ibar);
_ibar_resize_handle(inst->ibar);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
for (i = inst->ibar->icons; i; i = i->next)
{
@ -666,7 +666,7 @@ _ibar_cb_app_change(void *data, E_Order *eo)
_ibar_fill(b);
_ibar_resize_handle(b);
if (b->inst)
_gc_orient(b->inst->gcc);
_gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
}
static void
@ -713,11 +713,13 @@ static void
_ibar_cb_menu_icon_remove(void *data, E_Menu *m, E_Menu_Item *mi)
{
IBar_Icon *ic;
E_Gadcon_Client *gc;
ic = data;
ic->ibar->icons = eina_list_remove(ic->ibar->icons, ic);
_ibar_resize_handle(ic->ibar);
_gc_orient(ic->ibar->inst->gcc);
gc = ic->ibar->inst->gcc;
_gc_orient(gc, gc->gadcon->orient);
e_order_remove(ic->ibar->apps, ic->app);
_ibar_icon_free(ic);
}
@ -913,6 +915,7 @@ _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info
Evas_Coord x, y, w, h;
unsigned int size;
const char *drag_types[] = { "enlightenment/desktop" };
E_Gadcon_Client *gc;
ic->drag.dnd = 1;
ic->drag.start = 0;
@ -929,7 +932,8 @@ _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info
e_drag_start(d, ic->drag.x, ic->drag.y);
ic->ibar->icons = eina_list_remove(ic->ibar->icons, ic);
_ibar_resize_handle(ic->ibar);
_gc_orient(ic->ibar->inst->gcc);
gc = ic->ibar->inst->gcc;
_gc_orient(gc, gc->gadcon->orient);
e_order_remove(ic->ibar->apps, ic->app);
_ibar_icon_free(ic);
}
@ -1058,7 +1062,7 @@ _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y)
-1, -1 /* max */
);
_ibar_resize_handle(inst->ibar);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
}
static void
@ -1117,7 +1121,7 @@ _ibar_inst_cb_leave(void *data, const char *type, void *event_info)
inst->ibar->o_drop_over = NULL;
_ibar_resize_handle(inst->ibar);
e_gadcon_client_autoscroll_cb_set(inst->gcc, NULL, NULL);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
}
static void
@ -1197,7 +1201,7 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info)
e_gadcon_client_autoscroll_cb_set(inst->gcc, NULL, NULL);
_ibar_empty_handle(inst->ibar);
_ibar_resize_handle(inst->ibar);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
}

45
src/modules/ibox/e_mod_main.c
Unescape View File

@ -9,11 +9,11 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_id_del(const char *id);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -181,12 +181,12 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
inst = gcc->data;
switch (gcc->gadcon->orient)
switch (orient)
{
case E_GADCON_ORIENT_FLOAT:
case E_GADCON_ORIENT_HORIZ:
@ -216,13 +216,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _("IBox");
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
char buf[4096];
@ -235,7 +235,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
Config_Item *ci;
@ -244,7 +244,7 @@ _gc_id_new(void)
}
static void
_gc_id_del(const char *id)
_gc_id_del(E_Gadcon_Client_Class *client_class, const char *id)
{
/* yes - don't do this. on shutdown gadgets are deleted and this means config
* for them is deleted - that means empty config is saved. keep them around
@ -762,7 +762,7 @@ _ibox_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info
Evas_Object *o;
Evas_Coord x, y, w, h;
const char *drag_types[] = { "enlightenment/border" };
E_Gadcon_Client *gcc;
ic->drag.dnd = 1;
ic->drag.start = 0;
@ -778,7 +778,8 @@ _ibox_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info
e_object_ref(E_OBJECT(ic->border));
ic->ibox->icons = eina_list_remove(ic->ibox->icons, ic);
_ibox_resize_handle(ic->ibox);
_gc_orient(ic->ibox->inst->gcc);
gcc = ic->ibox->inst->gcc;
_gc_orient(gcc, gcc->gadcon->orient);
_ibox_icon_free(ic);
}
}
@ -896,7 +897,7 @@ _ibox_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y)
-1, -1 /* max */
);
_ibox_resize_handle(inst->ibox);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
}
static void
@ -953,7 +954,7 @@ _ibox_inst_cb_leave(void *data, const char *type, void *event_info)
inst->ibox->o_drop_over = NULL;
e_gadcon_client_autoscroll_cb_set(inst->gcc, NULL, NULL);
_ibox_resize_handle(inst->ibox);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
}
static void
@ -1020,7 +1021,7 @@ _ibox_inst_cb_drop(void *data, const char *type, void *event_info)
_ibox_empty_handle(b);
e_gadcon_client_autoscroll_cb_set(inst->gcc, NULL, NULL);
_ibox_resize_handle(inst->ibox);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
}
static int
@ -1049,7 +1050,7 @@ _ibox_cb_event_border_add(void *data, int type, void *event)
e_box_pack_end(b->o_box, ic->o_holder);
_ibox_empty_handle(b);
_ibox_resize_handle(b);
_gc_orient(b->inst->gcc);
_gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
}
while (ibox)
@ -1078,7 +1079,7 @@ _ibox_cb_event_border_remove(void *data, int type, void *event)
b->icons = eina_list_remove(b->icons, ic);
_ibox_empty_handle(b);
_ibox_resize_handle(b);
_gc_orient(b->inst->gcc);
_gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
}
while (ibox)
ibox = eina_list_remove_list(ibox, ibox);
@ -1111,7 +1112,7 @@ _ibox_cb_event_border_iconify(void *data, int type, void *event)
e_box_pack_end(b->o_box, ic->o_holder);
_ibox_empty_handle(b);
_ibox_resize_handle(b);
_gc_orient(b->inst->gcc);
_gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
}
while (ibox)
@ -1140,7 +1141,7 @@ _ibox_cb_event_border_uniconify(void *data, int type, void *event)
b->icons = eina_list_remove(b->icons, ic);
_ibox_empty_handle(b);
_ibox_resize_handle(b);
_gc_orient(b->inst->gcc);
_gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
}
while (ibox)
@ -1237,7 +1238,7 @@ _ibox_cb_event_desk_show(void *data, int type, void *event)
_ibox_empty(b);
_ibox_fill(b);
_ibox_resize_handle(b);
_gc_orient(b->inst->gcc);
_gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient);
}
}
@ -1293,7 +1294,7 @@ _ibox_config_update(Config_Item *ci)
_ibox_empty(inst->ibox);
_ibox_fill(inst->ibox);
_ibox_resize_handle(inst->ibox);
_gc_orient(inst->gcc);
_gc_orient(inst->gcc, inst->gcc->gadcon->orient);
}
}

4
src/modules/illume/e_cfg.c
Unescape View File

@ -885,7 +885,7 @@ _e_cfg_gadgets_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
Gadit *gi;
if (!(cc = l->data)) continue;
if (cc->func.label) lbl = cc->func.label();
if (cc->func.label) lbl = cc->func.label(cc);
if (!lbl) lbl = cc->name;
on = 0;
for (l3 = local_slipshelf->gadcon->cf->clients; l3; l3 = l3->next)
@ -921,7 +921,7 @@ _e_cfg_gadgets_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
Gadit *gi;
if (!(cc = l->data)) continue;
if (cc->func.label) lbl = cc->func.label();
if (cc->func.label) lbl = cc->func.label(cc);
if (!lbl) lbl = cc->name;
on = 0;
for (l3 = local_slipshelf->gadcon_extra->cf->clients; l3; l3 = l3->next)

16
src/modules/illume/e_mod_gad_bluetooth.c
Unescape View File

@ -16,10 +16,10 @@ struct _Instance
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -109,7 +109,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -128,13 +128,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return "Bluetooth (Illume)";
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
/* FIXME: need icon
Evas_Object *o;
@ -150,7 +150,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

16
src/modules/illume/e_mod_gad_cfg.c
Unescape View File

@ -16,10 +16,10 @@ static void _cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_i
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -106,7 +106,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh;
@ -123,13 +123,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return "Configuration (Illume)";
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
/* FIXME: need icon
Evas_Object *o;
@ -145,7 +145,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

16
src/modules/illume/e_mod_gad_gsm.c
Unescape View File

@ -41,10 +41,10 @@ struct _Instance
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -216,7 +216,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -235,13 +235,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return "GSM (Illume)";
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
/* FIXME: need icon
Evas_Object *o;
@ -257,7 +257,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

16
src/modules/illume/e_mod_gad_usb.c
Unescape View File

@ -16,10 +16,10 @@ struct _Instance
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -109,7 +109,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -128,13 +128,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return "USB (Illume)";
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
/* FIXME: need icon
Evas_Object *o;
@ -150,7 +150,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

16
src/modules/illume/e_mod_gad_wifi.c
Unescape View File

@ -18,10 +18,10 @@ struct _Instance
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -114,7 +114,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -133,13 +133,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return "Wifi (Illume)";
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
/* FIXME: need icon
Evas_Object *o;
@ -155,7 +155,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}

8
src/modules/mixer/e_mod_main.c
Unescape View File

@ -949,20 +949,20 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _(_Name);
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
@ -972,7 +972,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
E_Mixer_Module_Context *ctxt;
Eina_List *instances;

20
src/modules/pager/e_mod_main.c
Unescape View File

@ -8,10 +8,10 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
@ -246,7 +246,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Instance *inst;
@ -258,13 +258,13 @@ _gc_orient(E_Gadcon_Client *gcc)
}
static char *
_gc_label(void)
_gc_label(E_Gadcon_Client_Class *client_class)
{
return _("Pager");
}
static Evas_Object *
_gc_icon(Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{
Evas_Object *o;
char buf[4096];
@ -277,7 +277,7 @@ _gc_icon(Evas *evas)
}
static const char *
_gc_id_new(void)
_gc_id_new(E_Gadcon_Client_Class *client_class)
{
return _gadcon_class.name;
}
@ -1609,7 +1609,7 @@ _pager_cb_event_zone_desk_count_set(void *data, int type, void *event)
p = l->data;
_pager_empty(p);
_pager_fill(p);
if (p->inst) _gc_orient(p->inst->gcc);
if (p->inst) _gc_orient(p->inst->gcc, p->inst->gcc->gadcon->orient);
}
return 1;
}
@ -1710,7 +1710,7 @@ _pager_cb_event_container_resize(void *data, int type, void *event)
e_layout_virtual_size_set(pd->o_layout, pd->desk->zone->w,
pd->desk->zone->h);
}
if (p->inst) _gc_orient(p->inst->gcc);
if (p->inst) _gc_orient(p->inst->gcc, p->inst->gcc->gadcon->orient);
/* TODO if (p->popup) */
}
return 1;

16
src/modules/start/e_mod_main.c
Unescape View File

@ -9,10 +9,10 @@
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
static char *_gc_label(void);
static Evas_Object *_gc_icon(Evas *evas);
static const char *_gc_id_new(void);