From: Enlightenment S. <no-...@en...> - 2008-11-04 05:55:11
|
Log: Update all EXTRA modules to Gadcon_client_class V3 Author: davemds Date: 2008-11-03 21:54:59 -0800 (Mon, 03 Nov 2008) New Revision: 37451 Modified: trunk/E-MODULES-EXTRA/alarm/e_mod_main.c trunk/E-MODULES-EXTRA/calendar/e_mod_main.c trunk/E-MODULES-EXTRA/cpu/e_mod_main.c trunk/E-MODULES-EXTRA/deskshow/e_mod_main.c trunk/E-MODULES-EXTRA/diskio/src/e_mod_main.c trunk/E-MODULES-EXTRA/efm_nav/src/e_mod_main.c trunk/E-MODULES-EXTRA/efm_path/src/e_mod_main.c trunk/E-MODULES-EXTRA/emu/po/fi.po trunk/E-MODULES-EXTRA/emu/po/zh_CN.po trunk/E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.c trunk/E-MODULES-EXTRA/execwatch/e_mod_main.c trunk/E-MODULES-EXTRA/forecasts/e_mod_main.c trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c trunk/E-MODULES-EXTRA/language/src/module/e_mod_main.c trunk/E-MODULES-EXTRA/mail/e_mod_main.c trunk/E-MODULES-EXTRA/mem/e_mod_main.c trunk/E-MODULES-EXTRA/moon/src/e_mod_main.c trunk/E-MODULES-EXTRA/mpdule/e_mod_main.c trunk/E-MODULES-EXTRA/net/po/de.po trunk/E-MODULES-EXTRA/net/po/eo.po trunk/E-MODULES-EXTRA/net/po/fi.po trunk/E-MODULES-EXTRA/net/po/it.po trunk/E-MODULES-EXTRA/net/po/zh_CN.po trunk/E-MODULES-EXTRA/net/src/e_mod_gadcon.c trunk/E-MODULES-EXTRA/news/src/module/e_mod_main.c trunk/E-MODULES-EXTRA/news/src/module/news_item.c trunk/E-MODULES-EXTRA/notification/src/e_mod_box.c trunk/E-MODULES-EXTRA/notification/src/e_mod_main.c trunk/E-MODULES-EXTRA/notification/src/e_mod_main.h trunk/E-MODULES-EXTRA/photo/src/module/e_mod_main.c trunk/E-MODULES-EXTRA/screenshot/src/e_mod_main.c trunk/E-MODULES-EXTRA/skel/src/e_mod_main.c trunk/E-MODULES-EXTRA/slideshow/e_mod_main.c trunk/E-MODULES-EXTRA/taskbar/e_mod_main.c trunk/E-MODULES-EXTRA/tclock/e_mod_main.c trunk/E-MODULES-EXTRA/uptime/e_mod_main.c trunk/E-MODULES-EXTRA/weather/e_mod_main.c trunk/E-MODULES-EXTRA/winselector/e_mod_main.c trunk/E-MODULES-EXTRA/wlan/e_mod_main.c Modified: trunk/E-MODULES-EXTRA/alarm/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/alarm/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/alarm/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -17,10 +17,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); static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, @@ -138,7 +138,7 @@ } static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { int w, h; @@ -155,7 +155,7 @@ } /* vertical */ - switch (gcc->gadcon->orient) + switch (orient) { case E_GADCON_ORIENT_VERT: case E_GADCON_ORIENT_LEFT: @@ -175,13 +175,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("Alarm"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -194,7 +194,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { return _gadcon_class.name; } @@ -550,7 +550,7 @@ Instance *i; i = eina_list_data_get(l); - _gc_orient(i->gcc); + _gc_orient(i->gcc, i->gcc->gadcon->orient); } if (alarm_config->alarms_details) Modified: trunk/E-MODULES-EXTRA/calendar/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/calendar/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/calendar/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -26,10 +26,10 @@ 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); static Config_Item *_config_item_get(const char *id); static int _update_date(void *data); static void _update_calendar_sheet(Instance *inst); @@ -121,20 +121,20 @@ } 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 "Calendar"; } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -150,7 +150,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; Eina_List *l; Modified: trunk/E-MODULES-EXTRA/cpu/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/cpu/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/cpu/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -29,10 +29,10 @@ 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); static Config_Item *_config_item_get(const char *id); static int _set_cpu_load(void *data); static int _get_cpu_count(void); @@ -117,20 +117,20 @@ } 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 D_("Cpu"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -146,7 +146,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/deskshow/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/deskshow/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/deskshow/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -8,10 +8,10 @@ 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); static int _deskshow_cb_event_desk_show(void *data, int type, void *event); /* and actually define the gadcon class that this module provides (just 1) */ @@ -93,20 +93,20 @@ } 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 "Deskshow"; } static Evas_Object * -_gc_icon (Evas * evas) +_gc_icon (E_Gadcon_Client_Class *client_class, Evas * evas) { Evas_Object *o; char buf[4096]; @@ -119,7 +119,7 @@ } static const char * -_gc_id_new (void) +_gc_id_new (E_Gadcon_Client_Class *client_class) { return _gadcon_class.name; } Modified: trunk/E-MODULES-EXTRA/diskio/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/diskio/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/diskio/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -4,11 +4,11 @@ /* Local Function Prototypes */ 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 const char *_gc_id_new(void); -static void _gc_id_del(const char *id); -static Evas_Object *_gc_icon(Evas *evas); +static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); +static char *_gc_label(E_Gadcon_Client_Class *client_class); +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); +static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static void _diskio_conf_new(void); static void _diskio_conf_free(void); @@ -330,7 +330,7 @@ /* For for when container says we are changing position */ 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); @@ -338,14 +338,14 @@ /* Gadget/Module label */ static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return "DiskIO"; } /* so E can keep a unique instance per-container */ static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci = NULL; @@ -355,7 +355,7 @@ /* gets called when container says remove this item */ static void -_gc_id_del(const char *id) +_gc_id_del(E_Gadcon_Client_Class *client_class, const char *id) { Config_Item *ci = NULL; @@ -370,7 +370,7 @@ } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o = NULL; char buf[4096]; Modified: trunk/E-MODULES-EXTRA/efm_nav/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/efm_nav/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/efm_nav/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -17,10 +17,10 @@ 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); static void _cb_mouse_down (void *data, Evas *e, Evas_Object *obj, void *event_info); static void _cb_back_click (void *data, Evas_Object *obj, @@ -166,12 +166,12 @@ } 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_TOP: case E_GADCON_ORIENT_BOTTOM: @@ -188,13 +188,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("EFM Navigation"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o = NULL; char buf[4096]; @@ -207,7 +207,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { char buf[4096]; Modified: trunk/E-MODULES-EXTRA/efm_path/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/efm_path/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/efm_path/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -14,10 +14,10 @@ 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); static void _cb_changed (void *data, Evas_Object *obj, void *event_info); static void _cb_dir_changed (void *data, Evas_Object *obj, @@ -126,19 +126,19 @@ } static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { e_gadcon_client_min_size_set(gcc, 32, 16); } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("EFM Path"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o = NULL; char buf[4096]; @@ -151,7 +151,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { char buf[4096]; Modified: trunk/E-MODULES-EXTRA/emu/po/fi.po =================================================================== --- trunk/E-MODULES-EXTRA/emu/po/fi.po 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/emu/po/fi.po 2008-11-04 05:54:59 UTC (rev 37451) @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Emu module (e17)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-22 18:46+0200\n" +"Report-Msgid-Bugs-To: enl...@li...\n" +"POT-Creation-Date: 2008-11-04 05:33+0100\n" "PO-Revision-Date: 2008-01-23 01:50+0200\n" "Last-Translator: Jani väyrynen <jan...@gm...>\n" "Language-Team: Finnish <jan...@gm...>\n" @@ -14,22 +14,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/modules/emu/e_mod_config.c:40 -msgid "Emu Configuration" -msgstr "Emun asetukset" - -#: src/modules/emu/e_mod_main.c:211 -msgid "Enlightenment Emu Module - error" -msgstr "Englihtenmentin Emumoduuli - virhe" - -#: src/modules/emu/e_mod_main.c:211 -msgid "There is no emu." -msgstr "Emua ei ole." - -#: src/modules/emu/e_mod_main.c:285 -msgid "Emu" -msgstr "Emu" - #: src/modules/emu/border_props.c:52 msgid "Window properties" msgstr "Ikkunan ominaisuudet" @@ -125,3 +109,19 @@ #: src/modules/emu/border_props.c:340 msgid "Window list skip (%w)" msgstr "Ikkunalistan sivuutus (%w)" + +#: src/modules/emu/e_mod_config.c:40 +msgid "Emu Configuration" +msgstr "Emun asetukset" + +#: src/modules/emu/e_mod_main.c:211 +msgid "Enlightenment Emu Module - error" +msgstr "Englihtenmentin Emumoduuli - virhe" + +#: src/modules/emu/e_mod_main.c:211 +msgid "There is no emu." +msgstr "Emua ei ole." + +#: src/modules/emu/e_mod_main.c:285 +msgid "Emu" +msgstr "Emu" Modified: trunk/E-MODULES-EXTRA/emu/po/zh_CN.po =================================================================== --- trunk/E-MODULES-EXTRA/emu/po/zh_CN.po 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/emu/po/zh_CN.po 2008-11-04 05:54:59 UTC (rev 37451) @@ -1,36 +1,20 @@ # Emu module (e17), Simplified Chinese translation # This file is put in the public domain. -# -# -# +# +# +# msgid "" msgstr "" "Project-Id-Version: Emu module (e17)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-22 18:46+0200\n" +"Report-Msgid-Bugs-To: enl...@li...\n" +"POT-Creation-Date: 2008-11-04 05:33+0100\n" "PO-Revision-Date: 2008-10-22 21:22+0800\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" -#: src/modules/emu/e_mod_config.c:40 -msgid "Emu Configuration" -msgstr "" - -#: src/modules/emu/e_mod_main.c:211 -msgid "Enlightenment Emu Module - error" -msgstr "" - -#: src/modules/emu/e_mod_main.c:211 -msgid "There is no emu." -msgstr "" - -#: src/modules/emu/e_mod_main.c:285 -msgid "Emu" -msgstr "" - #: src/modules/emu/border_props.c:52 msgid "Window properties" msgstr "" @@ -127,3 +111,18 @@ msgid "Window list skip (%w)" msgstr "" +#: src/modules/emu/e_mod_config.c:40 +msgid "Emu Configuration" +msgstr "" + +#: src/modules/emu/e_mod_main.c:211 +msgid "Enlightenment Emu Module - error" +msgstr "" + +#: src/modules/emu/e_mod_main.c:211 +msgid "There is no emu." +msgstr "" + +#: src/modules/emu/e_mod_main.c:285 +msgid "Emu" +msgstr "" Modified: trunk/E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/emu/src/modules/emu/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -31,10 +31,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); /* Parsers. */ static void _emu_parse_command(Emu_Face *emu_face, int command, char *name, int start, int end); @@ -273,20 +273,20 @@ } 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 D_("Emu"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -298,7 +298,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { return _gadcon_class.name; } Modified: trunk/E-MODULES-EXTRA/execwatch/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/execwatch/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/execwatch/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -34,10 +34,10 @@ 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); static Config_Item *_config_item_get(const char *id); static void _execwatch_icon(Instance *inst, char *icon); static int _execwatch_status_cmd_exec(void *data); @@ -138,20 +138,20 @@ } 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 "Execwatch"; } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -167,7 +167,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/forecasts/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/forecasts/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/forecasts/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -18,10 +18,10 @@ 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); static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_item_edd = NULL; @@ -229,13 +229,13 @@ } 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: edje_object_signal_emit(inst->forecasts_obj, "e,state,orientation,float", "e"); @@ -251,13 +251,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("Forecasts"); } static Evas_Object * -_gc_icon(Evas * evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas * evas) { Evas_Object *o; char buf[4096]; @@ -270,7 +270,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -10,11 +10,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 = { @@ -173,7 +173,7 @@ evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _iiirk_cb_obj_moveresize, inst); iiirk_config->instances = eina_list_append(iiirk_config->instances, inst); - _gc_orient(gcc); + _gc_orient(gcc, gcc->gadcon->orient); return gcc; } @@ -191,7 +191,7 @@ } static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { Instance *inst; @@ -226,13 +226,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("IIirk"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -245,7 +245,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; @@ -254,7 +254,7 @@ } static void -_gc_id_del(const char *id) +_gc_id_del(E_Gadcon_Client_Class *client_class, const char *id) { Config_Item *ci; @@ -699,7 +699,7 @@ _iiirk_fill(b); _iiirk_resize_handle(b); if (b->inst) - _gc_orient(b->inst->gcc); + _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient); } static void @@ -871,7 +871,7 @@ ic->iiirk->icons = eina_list_remove(ic->iiirk->icons, ic); if (ic->border->desktop) e_order_remove(ic->iiirk->apps, ic->border->desktop); _iiirk_resize_handle(ic->iiirk); - _gc_orient(ic->iiirk->inst->gcc); + _gc_orient(ic->iiirk->inst->gcc, ic->iiirk->inst->gcc->gadcon->orient); _iiirk_icon_free(ic); } } @@ -989,7 +989,7 @@ -1, -1 /* max */ ); _iiirk_resize_handle(inst->iiirk); - _gc_orient(inst->gcc); + _gc_orient(inst->gcc, inst->gcc->gadcon->orient); } static void @@ -1046,7 +1046,7 @@ inst->iiirk->o_drop_over = NULL; e_gadcon_client_autoscroll_cb_set(inst->gcc, NULL, NULL); _iiirk_resize_handle(inst->iiirk); - _gc_orient(inst->gcc); + _gc_orient(inst->gcc, inst->gcc->gadcon->orient); } static void @@ -1127,7 +1127,7 @@ _iiirk_empty_handle(b); e_gadcon_client_autoscroll_cb_set(inst->gcc, NULL, NULL); _iiirk_resize_handle(inst->iiirk); - _gc_orient(inst->gcc); + _gc_orient(inst->gcc, inst->gcc->gadcon->orient); } static int @@ -1194,7 +1194,7 @@ e_box_pack_end(b->o_box, ic->o_holder); _iiirk_empty_handle(b); _iiirk_resize_handle(b); - _gc_orient(b->inst->gcc); + _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient); } } } @@ -1224,7 +1224,7 @@ b->icons = eina_list_remove(b->icons, ic); _iiirk_empty_handle(b); _iiirk_resize_handle(b); - _gc_orient(b->inst->gcc); + _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient); } while (iiirk) iiirk = eina_list_remove_list(iiirk, iiirk); @@ -1364,7 +1364,7 @@ _iiirk_empty(b); _iiirk_fill(b); _iiirk_resize_handle(b); - _gc_orient(b->inst->gcc); + _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient); } } @@ -1433,7 +1433,7 @@ _iiirk_empty(inst->iiirk); _iiirk_fill(inst->iiirk); _iiirk_resize_handle(inst->iiirk); - _gc_orient(inst->gcc); + _gc_orient(inst->gcc, inst->gcc->gadcon->orient); } } Modified: trunk/E-MODULES-EXTRA/language/src/module/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/language/src/module/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/language/src/module/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -27,10 +27,10 @@ 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); static const E_Gadcon_Client_Class _gadcon_class = { @@ -99,7 +99,7 @@ free(inst); } static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { Instance *inst; @@ -108,12 +108,12 @@ e_gadcon_client_min_size_set(gcc, 16, 16); } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("Language"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -126,7 +126,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { return _gadcon_class.name; } Modified: trunk/E-MODULES-EXTRA/mail/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/mail/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/mail/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -35,10 +35,10 @@ 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); /* Func Protos for Module */ static void _mail_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, @@ -177,20 +177,20 @@ } 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 D_("Mail"); } static Evas_Object * -_gc_icon (Evas * evas) +_gc_icon (E_Gadcon_Client_Class *client_class, Evas * evas) { Evas_Object *o; char buf[4096]; @@ -203,7 +203,7 @@ } static const char * -_gc_id_new (void) +_gc_id_new (E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/mem/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/mem/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/mem/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -23,10 +23,10 @@ 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); /* Func Protos for Module */ static void _mem_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, @@ -93,20 +93,20 @@ } 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 D_ ("Mem"); } static Evas_Object * -_gc_icon (Evas * evas) +_gc_icon (E_Gadcon_Client_Class *client_class, Evas * evas) { Evas_Object *o; char buf[4096]; @@ -119,7 +119,7 @@ } static const char * -_gc_id_new (void) +_gc_id_new (E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/moon/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/moon/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/moon/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -15,10 +15,10 @@ 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); static const E_Gadcon_Client_Class _gadcon_class = { @@ -190,7 +190,7 @@ } static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { Instance *inst; Evas_Coord w, h; @@ -202,13 +202,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("Moon"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -220,7 +220,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { return _gadcon_class.name; } Modified: trunk/E-MODULES-EXTRA/mpdule/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/mpdule/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/mpdule/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -18,10 +18,10 @@ 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); /* Module Protos */ static void _mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, @@ -180,7 +180,7 @@ } static void -_gc_orient (E_Gadcon_Client * gcc) +_gc_orient (E_Gadcon_Client * gcc, E_Gadcon_Orient orient) { Instance *inst; Evas_Coord mw, mh; @@ -191,13 +191,13 @@ } static char * -_gc_label (void) +_gc_label (E_Gadcon_Client_Class *client_class) { return D_ ("MPDule"); } static Evas_Object * -_gc_icon (Evas * evas) +_gc_icon (E_Gadcon_Client_Class *client_class, Evas * evas) { Evas_Object *o; char buf[4096]; @@ -210,7 +210,7 @@ } static const char * -_gc_id_new (void) +_gc_id_new (E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/net/po/de.po =================================================================== --- trunk/E-MODULES-EXTRA/net/po/de.po 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/net/po/de.po 2008-11-04 05:54:59 UTC (rev 37451) @@ -3,19 +3,19 @@ # This file is distributed under the same license as the net package. # Andreas Volz <and...@tu...>, 2008. # , fuzzy -# -# +# +# msgid "" msgstr "" "Project-Id-Version: net 0.0.1\n" "Report-Msgid-Bugs-To: enl...@li...\n" -"POT-Creation-Date: 2008-01-06 17:47+0100\n" +"POT-Creation-Date: 2008-11-04 05:58+0100\n" "PO-Revision-Date: 2008-01-06 17:54+0100\n" "Last-Translator: Andreas Volz <and...@tu...>\n" "Language-Team: German\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: src/e_mod_configure.c:44 msgid "Net Module Configuration" @@ -65,8 +65,7 @@ msgid "Configuration" msgstr "Konfiguration" -#: src/e_mod_net.c:204 +#: src/e_mod_net.c:203 #, c-format msgid "Device - %s" msgstr "Gerät - %s" - Modified: trunk/E-MODULES-EXTRA/net/po/eo.po =================================================================== --- trunk/E-MODULES-EXTRA/net/po/eo.po 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/net/po/eo.po 2008-11-04 05:54:59 UTC (rev 37451) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Net\n" "Report-Msgid-Bugs-To: enl...@li...\n" -"POT-Creation-Date: 2008-01-06 17:47+0100\n" +"POT-Creation-Date: 2008-11-04 05:58+0100\n" "PO-Revision-Date: 2007-06-04 15:41+0100\n" "Last-Translator: Olivier M. <oli...@if...>\n" "Language-Team: Esperanto <tra...@li...>\n" @@ -65,8 +65,7 @@ msgid "Configuration" msgstr "Agordo" -#: src/e_mod_net.c:204 +#: src/e_mod_net.c:203 #, c-format msgid "Device - %s" msgstr "Aparato - %s" - Modified: trunk/E-MODULES-EXTRA/net/po/fi.po =================================================================== --- trunk/E-MODULES-EXTRA/net/po/fi.po 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/net/po/fi.po 2008-11-04 05:54:59 UTC (rev 37451) @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Net module (e17)\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-22 20:34+0200\n" +"Report-Msgid-Bugs-To: enl...@li...\n" +"POT-Creation-Date: 2008-11-04 05:58+0100\n" "PO-Revision-Date: 2008-01-23 01:50+0200\n" "Last-Translator: Jani väyrynen <jan...@gm...>\n" "Language-Team: Finnish <jan...@gm...>\n" @@ -14,19 +14,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/e_mod_net.c:168 -msgid "Configuration" -msgstr "Asetukset" - -#: src/e_mod_net.c:204 -#, c-format -msgid "Device - %s" -msgstr "Laite - %s" - -#: src/e_mod_gadcon.c:91 -msgid "Net" -msgstr "Verkko" - #: src/e_mod_configure.c:44 msgid "Net Module Configuration" msgstr "Verkkomoduulin asetukset" @@ -66,3 +53,16 @@ #: src/e_mod_configure.c:137 msgid "Device Settings" msgstr "Laiteasetukset" + +#: src/e_mod_gadcon.c:91 +msgid "Net" +msgstr "Verkko" + +#: src/e_mod_net.c:168 +msgid "Configuration" +msgstr "Asetukset" + +#: src/e_mod_net.c:203 +#, c-format +msgid "Device - %s" +msgstr "Laite - %s" Modified: trunk/E-MODULES-EXTRA/net/po/it.po =================================================================== --- trunk/E-MODULES-EXTRA/net/po/it.po 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/net/po/it.po 2008-11-04 05:54:59 UTC (rev 37451) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Net\n" "Report-Msgid-Bugs-To: enl...@li...\n" -"POT-Creation-Date: 2008-01-06 17:47+0100\n" +"POT-Creation-Date: 2008-11-04 05:58+0100\n" "PO-Revision-Date: 2007-11-18 19:22+0100\n" "Last-Translator: Massimo Maiurana <mai...@in...>\n" "Language-Team: none\n" @@ -62,7 +62,7 @@ msgid "Configuration" msgstr "Configurazione" -#: src/e_mod_net.c:204 +#: src/e_mod_net.c:203 #, c-format msgid "Device - %s" msgstr "Dispositivo - %s" Modified: trunk/E-MODULES-EXTRA/net/po/zh_CN.po =================================================================== --- trunk/E-MODULES-EXTRA/net/po/zh_CN.po 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/net/po/zh_CN.po 2008-11-04 05:54:59 UTC (rev 37451) @@ -1,19 +1,19 @@ # Simplified Chinese translation of net in e17 # Copyright 2008 GNU project. # Aron Xu <aro...@16...>, 2008.batden <ba...@or...>, 2008. -# -# +# +# msgid "" msgstr "" "Project-Id-Version: Net e17\n" "Report-Msgid-Bugs-To: enl...@li...\n" -"POT-Creation-Date: 2008-10-10 08:42+0400\n" +"POT-Creation-Date: 2008-11-04 05:58+0100\n" "PO-Revision-Date: 2008-10-22 21:42+0800\n" "Last-Translator: Aron Xu <aro...@16...>\n" "Language-Team: Chinese/Simplified <i18...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: src/e_mod_configure.c:44 msgid "Net Module Configuration" @@ -70,5 +70,6 @@ #~ msgid "Network Monitor Module" #~ msgstr "Module de surveillance réseau" + #~ msgid "Module to monitor network traffic" #~ msgstr "Module permettant la surveillance de l'activité réseau" Modified: trunk/E-MODULES-EXTRA/net/src/e_mod_gadcon.c =================================================================== --- trunk/E-MODULES-EXTRA/net/src/e_mod_gadcon.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/net/src/e_mod_gadcon.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -6,10 +6,10 @@ 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); static const E_Gadcon_Client_Class _gc_class = { @@ -79,20 +79,20 @@ } 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 D_("Net"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -105,7 +105,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/news/src/module/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/news/src/module/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/news/src/module/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -17,10 +17,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); static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, @@ -141,7 +141,7 @@ } static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { News_Item *ni; int nb_feeds; @@ -182,7 +182,7 @@ if (!nb_feeds) nb_feeds = 1; } - switch (gcc->gadcon->orient) + switch (orient) { case E_GADCON_ORIENT_FLOAT: case E_GADCON_ORIENT_HORIZ: @@ -214,13 +214,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("News"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; @@ -230,7 +230,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { News_Config_Item *nic; Modified: trunk/E-MODULES-EXTRA/news/src/module/news_item.c =================================================================== --- trunk/E-MODULES-EXTRA/news/src/module/news_item.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/news/src/module/news_item.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -136,7 +136,7 @@ /* resize the gadcon */ if (changed_order && ni->gcc->client_class) - ni->gcc->client_class->func.orient(ni->gcc); + ni->gcc->client_class->func.orient(ni->gcc, ni->gcc->gadcon->orient); } void Modified: trunk/E-MODULES-EXTRA/notification/src/e_mod_box.c =================================================================== --- trunk/E-MODULES-EXTRA/notification/src/e_mod_box.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/notification/src/e_mod_box.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -103,7 +103,7 @@ } _notification_box_empty_handle(b); _notification_box_resize_handle(b); - _gc_orient(b->inst->gcc); + _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient); } eina_list_free(n_box); @@ -284,7 +284,7 @@ _notification_box_icon_free(ic); _notification_box_empty_handle(b); _notification_box_resize_handle(b); - _gc_orient(inst->gcc); + _gc_orient(inst->gcc, inst->gcc->gadcon->orient); } return 1; } @@ -794,7 +794,7 @@ _notification_box_icon_free(ic); _notification_box_empty_handle(b); _notification_box_resize_handle(b); - _gc_orient(b->inst->gcc); + _gc_orient(b->inst->gcc, b->inst->gcc->gadcon->orient); } } Modified: trunk/E-MODULES-EXTRA/notification/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/notification/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/notification/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -6,10 +6,10 @@ const char *id, const char *style); static void _gc_shutdown (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 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); /* Callback function protos */ static int _notification_cb_notify (E_Notification_Daemon *daemon, @@ -62,7 +62,7 @@ evas_object_event_callback_add(b->o_box, EVAS_CALLBACK_RESIZE, notification_box_cb_obj_moveresize, inst); notification_cfg->instances = eina_list_append(notification_cfg->instances, inst); - _gc_orient(gcc); + _gc_orient(gcc, gc->orient); return gcc; } @@ -78,12 +78,12 @@ } 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: @@ -113,13 +113,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("Notification Box"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -134,7 +134,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; @@ -143,7 +143,7 @@ } static void -_gc_id_del(const char *id) +_gc_id_del(E_Gadcon_Client_Class *client_class, const char *id) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/notification/src/e_mod_main.h =================================================================== --- trunk/E-MODULES-EXTRA/notification/src/e_mod_main.h 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/notification/src/e_mod_main.h 2008-11-04 05:54:59 UTC (rev 37451) @@ -74,7 +74,7 @@ EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -void _gc_orient (E_Gadcon_Client *gcc); +void _gc_orient (E_Gadcon_Client *gcc, E_Gadcon_Orient orient); EAPI E_Config_Dialog *e_int_config_notification_module(E_Container *con, const char *params __UNUSED__); Modified: trunk/E-MODULES-EXTRA/photo/src/module/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/photo/src/module/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/photo/src/module/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -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); static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, @@ -168,20 +168,20 @@ } 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 D_("Photo"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -194,7 +194,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { return _gadcon_class.name; } Modified: trunk/E-MODULES-EXTRA/screenshot/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/screenshot/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/screenshot/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -18,10 +18,10 @@ 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); static void _cfg_free (void); static int _cfg_timer (void *data); static void _cfg_new (void); @@ -240,20 +240,20 @@ } 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 "Screenshot"; } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o = NULL; char buf[4096]; @@ -265,7 +265,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { char buf[4096]; Modified: trunk/E-MODULES-EXTRA/skel/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/skel/src/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/skel/src/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -4,11 +4,11 @@ /* Local Function Prototypes */ 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 const char *_gc_id_new(void); -static void _gc_id_del(const char *id); -static Evas_Object *_gc_icon(Evas *evas); +static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); +static char *_gc_label(E_Gadcon_Client_Class *client_class); +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); +static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static void _skel_conf_new(void); static void _skel_conf_free(void); @@ -275,7 +275,7 @@ /* For for when container says we are changing position */ 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); @@ -283,14 +283,14 @@ /* Gadget/Module label */ static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("Skeleton"); } /* so E can keep a unique instance per-container */ static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci = NULL; @@ -300,7 +300,7 @@ /* gets called when container says remove this item */ static void -_gc_id_del(const char *id) +_gc_id_del(E_Gadcon_Client_Class *client_class, const char *id) { Config_Item *ci = NULL; @@ -314,7 +314,7 @@ } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o = NULL; char buf[4096]; Modified: trunk/E-MODULES-EXTRA/slideshow/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/slideshow/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/slideshow/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -30,10 +30,10 @@ 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); static void _slide_cb_mouse_down (void *data, Evas *e, Evas_Object *obj, void *event_info); static void _slide_menu_cb_configure (void *data, E_Menu *m, E_Menu_Item *mi); @@ -128,20 +128,20 @@ } 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 D_ ("Slideshow"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -154,7 +154,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *ci; Modified: trunk/E-MODULES-EXTRA/taskbar/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/taskbar/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/taskbar/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -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 E_Gadcon_Client_Class _gadcon_class = { @@ -242,13 +242,13 @@ /* TODO */ static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { Taskbar *taskbar; taskbar = (Taskbar *)gcc->data; - switch (gcc->gadcon->orient) + switch (orient) { case E_GADCON_ORIENT_FLOAT: case E_GADCON_ORIENT_HORIZ: @@ -286,13 +286,13 @@ } static char * -_gc_label(void) +_gc_label(E_Gadcon_Client_Class *client_class) { return D_("Taskbar"); } static Evas_Object * -_gc_icon(Evas *evas) +_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -304,7 +304,7 @@ } static const char * -_gc_id_new(void) +_gc_id_new(E_Gadcon_Client_Class *client_class) { Config_Item *config; Modified: trunk/E-MODULES-EXTRA/tclock/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/tclock/e_mod_main.c 2008-11-04 03:57:45 UTC (rev 37450) +++ trunk/E-MODULES-EXTRA/tclock/e_mod_main.c 2008-11-04 05:54:59 UTC (rev 37451) @@ -17,10 +17,10 @@ /* Func Proto Requirements for Gadcon */ 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); /* Module Protos */ static void _tclock_cb_mouse_down (void *data, Evas *e, Evas_Object *obj, void *event_info); @@ -125,7 +125,7 @@ } static void -_gc_orient (E_Gadcon_Client * gcc) +_gc_orient (E_Gadcon_Client * gcc, E_Gadcon_Orient orient) { ... [truncated message content] |