E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_keybindings.c Log Message: * make module compile again wrt recent api changes === RCS file: /cvs/e/e_modules/language/src/module/e_mod_keybindings.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_keybindings.c 18 May 2006 15:03:28 - 1.11 +++ e_mod_keybindings.c 11 Oct 2006 11:13:42 - 1.12 @@ -45,10 +45,10 @@ { E_Action *act; - e_register_action_predef_name(LANG_ACTION_GROUP, LANG_ACTION_NEXT_LANGUAGE, LANG_NEXT_ACTION, -NULL, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0); - e_register_action_predef_name(LANG_ACTION_GROUP, LANG_ACTION_PREV_LANGUAGE, LANG_PREV_ACTION, -NULL, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0); + e_action_predef_name_set(LANG_ACTION_GROUP, LANG_ACTION_NEXT_LANGUAGE, LANG_NEXT_ACTION, +NULL, NULL, ACT_EDIT_RESTRICT_ACTION | ACT_EDIT_RESTRICT_PARAMS); + e_action_predef_name_set(LANG_ACTION_GROUP, LANG_ACTION_PREV_LANGUAGE, LANG_PREV_ACTION, +NULL, NULL, ACT_EDIT_RESTRICT_ACTION | ACT_EDIT_RESTRICT_PARAMS); // these two are strongly connected with LANG_NEXT_ACTION and LANG_PREV_ACTION ACT_GO(switch_next_language); @@ -63,8 +63,8 @@ e_action_del(LANG_NEXT_ACTION); e_action_del(LANG_PREV_ACTION); - e_unregister_action_predef_name(LANG_ACTION_GROUP, LANG_ACTION_NEXT_LANGUAGE); - e_unregister_action_predef_name(LANG_ACTION_GROUP, LANG_ACTION_PREV_LANGUAGE); + e_action_predef_name_del(LANG_ACTION_GROUP, LANG_ACTION_NEXT_LANGUAGE); + e_action_predef_name_del(LANG_ACTION_GROUP, LANG_ACTION_PREV_LANGUAGE); e_config_save(); return 1; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_keybindings.c Log Message: * no need in those (ACT_EDIT_*) flags === RCS file: /cvs/e/e_modules/language/src/module/e_mod_keybindings.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_keybindings.c 11 Oct 2006 11:13:42 - 1.12 +++ e_mod_keybindings.c 11 Oct 2006 12:17:22 - 1.13 @@ -46,9 +46,9 @@ E_Action *act; e_action_predef_name_set(LANG_ACTION_GROUP, LANG_ACTION_NEXT_LANGUAGE, LANG_NEXT_ACTION, -NULL, NULL, ACT_EDIT_RESTRICT_ACTION | ACT_EDIT_RESTRICT_PARAMS); +NULL, NULL, 0); e_action_predef_name_set(LANG_ACTION_GROUP, LANG_ACTION_PREV_LANGUAGE, LANG_PREV_ACTION, -NULL, NULL, ACT_EDIT_RESTRICT_ACTION | ACT_EDIT_RESTRICT_PARAMS); +NULL, NULL, 0); // these two are strongly connected with LANG_NEXT_ACTION and LANG_PREV_ACTION ACT_GO(switch_next_language); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: Makefile.am Log Message: a patch from Takayuki Yamaguchi. === RCS file: /cvs/e/e_modules/language/src/module/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 17 May 2006 22:26:00 - 1.2 +++ Makefile.am 3 Sep 2006 15:29:38 - 1.3 @@ -1,7 +1,7 @@ INCLUDES = -I. \ -I$(top_srcdir) \ -I$(includedir) \ - @e_cflags@ + @e_cflags@ @exml_cflags@ pkgdir = $(datadir)/$(MODULE_ARCH) pkg_LTLIBRARIES= module.la @@ -13,7 +13,7 @@ e_mod_keybindings.h \ e_mod_lang.c \ e_mod_lang.h -module_la_LIBADD = @e_libs@ -lexml -lxkbfile -lX11 +module_la_LIBADD = @e_libs@ @exml_libs@ -lxkbfile -lX11 module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: configure.in Log Message: a patch from Takayuki Yamaguchi. === RCS file: /cvs/e/e_modules/language/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in1 Sep 2006 14:35:23 - 1.12 +++ configure.in3 Sep 2006 15:29:37 - 1.13 @@ -147,7 +147,21 @@ AC_SUBST(e_libs) AC_SUBST(e_modules) -AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure your CFLAGS environment variable contains include lines for the location of this file and EXML lib is installed])) +AC_ARG_WITH(exml-config, +[ --with-exml-config=EXML_CONFIG use exml-config specified ], +[ + EXML_CONFIG=$withval; + echo using $EXML_CONFIG for exml-config; +],[ + PROG=exml-config; + AC_PATH_PROG(EXML_CONFIG, $PROG, , $PATH) +]) +exml_cflags=`$EXML_CONFIG --cflags` +exml_libs=`$EXML_CONFIG --libs` +AC_SUBST(exml_cflags) +AC_SUBST(exml_libs) + +#AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure your CFLAGS environment variable contains include lines for the location of this file and EXML lib is installed])) AC_CHECK_HEADERS(X11/XKBlib.h,, AC_MSG_ERROR([Cannot find XKBlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file.])) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: COPYING Added Files: COPYING-PLAIN Log Message: Move language module to Bsd licence as well. === RCS file: /cvs/e/e_modules/language/COPYING,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- COPYING 10 May 2006 22:49:01 - 1.1 +++ COPYING 16 Jun 2006 20:16:25 - 1.2 @@ -1,340 +1,28 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +Copyright (C) 2000 Aleksej Struk and various contributors (see AUTHORS) - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The Program, below, -refers to any such program or work, and a work based on the Program -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term modification.) Each licensee is addressed as you. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: autogen.sh Log Message: use --foreign instead of --gnu === RCS file: /cvs/e/e_modules/language/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 10 May 2006 22:49:01 - 1.1 +++ autogen.sh 16 Jun 2006 20:58:30 - 1.2 @@ -9,7 +9,7 @@ echo Running autoheader... ; autoheader || exit 1 echo Running autoconf... ; autoconf || exit 1 echo Running libtoolize... ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 -echo Running automake... ; automake --add-missing --copy --gnu || exit 1 +echo Running automake... ; automake --add-missing --copy --foreign || exit 1 if [ -z $NOCONFIGURE ]; then ./configure $@ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_lang.c Log Message: * FreeBSD wants this module also ;) === RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_mod_lang.c12 Jun 2006 21:52:28 - 1.27 +++ e_mod_lang.c14 Jun 2006 18:34:01 - 1.28 @@ -11,7 +11,11 @@ /**/ -#define DFLT_XKB_RULES_FILE /etc/X11/xkb/rules/xfree86 +#ifdef __FreeBSD__ + #define DFLT_XKB_RULES_FILE /usr/X11R6/lib/X11/xkb/rules/xfree86 +#else + #define DFLT_XKB_RULES_FILE /etc/X11/xkb/rules/xfree86 +#endif // __FreeBSD__ #define DFLT_XKB_LAYOUT us #define DFLT_XKB_MODEL pc101 @@ -206,7 +210,11 @@ result = exml_file_read(exml, /etc/X11/xkb/rules/xfree86.xml); if (!result || result == -1) { +#ifdef __FreeBSD__ + result = exml_file_read(exml, /usr/X11R6/lib/X11/xkb/rules/xfree86.xml); +#else result = exml_file_read(exml, /usr/lib/X11/xkb/rules/xfree86.xml); +#endif // __FreeBSD__ if (!result || result == -1) EXML_RETURN_ON_ERROR(exml); } @@ -294,7 +302,11 @@ result = exml_file_read(exml, /etc/X11/xkb/rules/xfree86.xml); if (!result || result == -1) { +#ifdef __FreeBSD__ + result = exml_file_read(exml, /usr/X11R6/lib/X11/xkb/rules/xfree86.xml); +#else result = exml_file_read(exml, /usr/lib/X11/xkb/rules/xfree86.xml); +#endif // __FreeBSD__ if (!result || result == -1) EXML_RETURN_ON_ERROR(exml); } ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_lang.c Log Message: * make use of /etc/X11/xkb/rules/xfree86.xml first and then /usr/lib/X11/xkb/rules/xfree86.xml Some users reported that they do not have xfree86.xml in /usr/lib/X11/... === RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_mod_lang.c1 Jun 2006 22:42:09 - 1.26 +++ e_mod_lang.c12 Jun 2006 21:52:28 - 1.27 @@ -203,9 +203,13 @@ if (!exml) return; if (!exml_init(exml)) EXML_RETURN_ON_ERROR(exml); - result = exml_file_read(exml, /usr/lib/X11/xkb/rules/xfree86.xml); + result = exml_file_read(exml, /etc/X11/xkb/rules/xfree86.xml); if (!result || result == -1) - EXML_RETURN_ON_ERROR(exml); + { + result = exml_file_read(exml, /usr/lib/X11/xkb/rules/xfree86.xml); + if (!result || result == -1) + EXML_RETURN_ON_ERROR(exml); + } exml_down(exml); @@ -287,9 +291,13 @@ if (!exml_init(exml)) EXML_RETURN_ON_ERROR(exml); - result = exml_file_read(exml, /usr/lib/X11/xkb/rules/xfree86.xml); + result = exml_file_read(exml, /etc/X11/xkb/rules/xfree86.xml); if (!result || result == -1) - EXML_RETURN_ON_ERROR(exml); + { + result = exml_file_read(exml, /usr/lib/X11/xkb/rules/xfree86.xml); + if (!result || result == -1) + EXML_RETURN_ON_ERROR(exml); + } if (strcasecmp(exml_tag_get(exml), xkbConfigRegistry)) EXML_RETURN_ON_ERROR(exml); ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO Log Message: * make use of /etc/X11/xkb/rules/xfree86.xml first and then /usr/lib/X11/xkb/rules/xfree86.xml Some users reported that they do not have xfree86.xml in /usr/lib/X11/... === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- TODO1 Jun 2006 23:09:46 - 1.18 +++ TODO12 Jun 2006 21:52:28 - 1.19 @@ -1 +1,2 @@ -0. Check for Memleaks? forget somewere to clear list or remove an item from it? +1. Add gettext support +2. Check for Memleaks? forget somewere to clear list or remove an item from it? ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_config.c e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h Log Message: * code reorganization/cleanup * changes wrt last modapi changes. * hack around exml_file_read. === RCS file: /cvs/e/e_modules/language/src/module/e_mod_config.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_config.c 29 May 2006 21:09:44 - 1.15 +++ e_mod_config.c 1 Jun 2006 19:23:42 - 1.16 @@ -17,23 +17,30 @@ lang_switch_policy_tlang_policy; int lang_show_indicator; - Evas_List *selected_languages; - /* for internal use only */ Config *conf; Evas*evas; + + Evas_List *s_langs; + + char *plang; + char *slang; + char *kb_model; + char *kb_variant; /*/ struct { - Evas_Object *lang_ilist; - Evas_Object *btn_add; - Evas_Object *btn_del; - Evas_Object *btn_move_up; - Evas_Object *btn_move_down; - Evas_Object *selected_lang_ilist; - Evas_Object *kbd_model_ilist; - Evas_Object *kbd_layout_variant_ilist; + Evas_Object *o_plang; + Evas_Object *o_slang; + + Evas_Object *o_add; + Evas_Object *o_del; + Evas_Object *o_up; + Evas_Object *o_down; + + Evas_Object *o_kbd_model; + Evas_Object *o_kbd_variant; } gui; }; @@ -42,65 +49,95 @@ /*** Config Dialog related funcs */ static void*_create_data(E_Config_Dialog *cfd); static void_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static int _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void_fill_data(E_Config_Dialog_Data *cfdata); +static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, + E_Config_Dialog_Data *cfdata); -/ button update funcs ***/ -static void _lang_update_select_button(E_Config_Dialog_Data *cfdata); -static void _lang_update_unselect_button(E_Config_Dialog_Data *cfdata); -static void _lang_update_language_moveup_button(E_Config_Dialog_Data *cfdata); -static void _lang_update_language_movedown_button(E_Config_Dialog_Data *cfdata); - -/*** ilist update funcs / -static void _lang_update_lang_defined_list(E_Config_Dialog_Data *cfdata); -static void _lang_update_selected_lang_list(E_Config_Dialog_Data *cfdata); -static void _lang_update_kbd_model_list(E_Config_Dialog_Data *cfdata); -static void _lang_update_kbd_layout_variant_list(E_Config_Dialog_Data *cfdata); - -/* button callbacks / -static void _lang_select_language_cb(void *data, void *data2); -static void _lang_unselect_language_cb(void *data, void *data2); -static void _lang_move_language_order_up_cb(void *data, void *data2); -static void _lang_move_language_order_down_cb(void *data, void *data2); - -/ ilist callbacks */ -static void _lang_languages_ilist_cb_change(void *data, Evas_Object *obj); -static void _lang_selected_languages_ilist_cb_change(void *data, Evas_Object *obj); -static void _lang_kbd_model_ilist_cb_change(void *data, Evas_Object *obj); -static void _lang_kbd_layout_variant_ilist_cb_change(void *data, Evas_Object *obj); -// +static void_fill_data(E_Config_Dialog_Data *cfdata); -void _lang_configure_language_module(Config *cfg) +/** ilist callbacks **/ +static void _conf_cb_planguage_select (void *data); +static void _conf_cb_slanguage_select (void *data); +static void _conf_cb_kbd_model_select (void *data); +static void _conf_cb_kbd_variant_select(void *data); + +/** button callbacks */ +static void _conf_cb_language_add (void *data, void *data2); +static void _conf_cb_language_del (void *data, void *data2); +static void _conf_cb_language_up(void *data, void *data2); +static void _conf_cb_language_down (void *data, void *data2); + +/* button state set functions / +static void _conf_add_button_availability_set (E_Config_Dialog_Data *cfdata); +static void _conf_del_button_availability_set (E_Config_Dialog_Data *cfdata); +static void _conf_up_button_availability_set (E_Config_Dialog_Data
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: Makefile.am module.eap Removed Files: module_icon.png Log Message: * code reorganization/cleanup * changes wrt last modapi changes. * hack around exml_file_read. === RCS file: /cvs/e/e_modules/language/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 15 May 2006 19:28:21 - 1.3 +++ Makefile.am 1 Jun 2006 19:23:42 - 1.4 @@ -5,8 +5,7 @@ # data files for the module filesdir = $(datadir) files_DATA = \ -module.eap \ -module_icon.png +module.eap EXTRA_DIST = $(files_DATA) === RCS file: /cvs/e/e_modules/language/module.eap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvs5gwUHc and /tmp/cvsGh1WCv differ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_lang.c e_mod_main.c Log Message: * enabling Config Key Bindings context menu item. * fixing memleaks. === RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- e_mod_lang.c1 Jun 2006 19:23:42 - 1.25 +++ e_mod_lang.c1 Jun 2006 22:42:09 - 1.26 @@ -500,6 +500,7 @@ if (lp-lang_flag) evas_stringshare_del(lp-lang_flag); snprintf(buf, sizeof(buf), %s_flag, ls ? ls : language); lp-lang_flag = evas_stringshare_add(buf); + if (ls) free(ls); } } @@ -549,7 +550,7 @@ if (!strcasecmp(tag, name)) { lp-kbd_variant = evas_list_append(lp-kbd_variant, - exml_value_get(xml)); + evas_stringshare_add(exml_value_get(xml))); break; } if (!exml_next_nomove(xml)) === RCS file: /cvs/e/e_modules/language/src/module/e_mod_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_mod_main.c1 Jun 2006 19:23:42 - 1.18 +++ e_mod_main.c1 Jun 2006 22:42:09 - 1.19 @@ -485,9 +485,7 @@ static void _language_face_cb_menu_keybindings_configure(void *data, E_Menu *m, E_Menu_Item *mi) { - e_module_dialog_show(, Not available at the moment. If you want to set yourbr - prefered key bindings, just do it using \Key Bindings\br - menu in E configuration panel. ); + e_int_config_keybindings(e_container_current_get(e_manager_current_get())); } static void _language_face_cb_menu_switch_language_to(void *data, E_Menu *m, E_Menu_Item *mi) ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO configure.in Log Message: todo -- === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- TODO29 May 2006 21:09:43 - 1.17 +++ TODO1 Jun 2006 23:09:46 - 1.18 @@ -1,6 +1 @@ -0. Fix the configure.in file in order to have dependencies to X11 and xkbfile - libraries. - -1. Remove all FIXMEs. - -2. Memleaks? forget somewere to clear list or remove an item from it? +0. Check for Memleaks? forget somewere to clear list or remove an item from it? === RCS file: /cvs/e/e_modules/language/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in29 May 2006 21:09:43 - 1.5 +++ configure.in1 Jun 2006 23:09:46 - 1.6 @@ -17,6 +17,12 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL +ALL_LINGUAS= +AC_SUBST(ALL_LINGUAS) + +#AM_GNU_GETTEXT([external]) +#AM_GNU_GETTEXT_VERSION(0.14) + MODULE_ARCH=$host_os-$host_cpu AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, $MODULE_ARCH, Module architecture) @@ -94,10 +100,9 @@ AC_SUBST(LOCALEDIR, ${localedir}) AC_DEFINE_UNQUOTED(LOCALEDIR, ${localedir}, [Module Locale Directory]) -AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) -AC_SUBST(dlopen_libs) +#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) +#AC_SUBST(dlopen_libs) -AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure your CFLAGS environment variable contains include lines for the location of this file and EXML lib is installed])) AC_ARG_WITH(edje-config, [ --with-edje-config=EDJE_CONFIG use edje-config specified ], @@ -141,6 +146,12 @@ AC_SUBST(e_cflags) AC_SUBST(e_libs) AC_SUBST(e_modules) + +AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure your CFLAGS environment variable contains include lines for the location of this file and EXML lib is installed])) + +AC_CHECK_HEADERS(X11/XKBlib.h,, AC_MSG_ERROR([Cannot find XKBlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file.])) + +AC_CHECK_HEADERS(X11/extensions/XKBrules.h,, AC_MSG_ERROR([Cannot find XKBrules.h. Make sure your CFLAGS environment variable contains include lines for the location of this file.])) AC_OUTPUT([ e_modules-language.spec ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_main.c Log Message: * Changing the size of the images. === RCS file: /cvs/e/e_modules/language/src/module/e_mod_main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_main.c29 May 2006 21:09:44 - 1.15 +++ e_mod_main.c30 May 2006 10:41:22 - 1.16 @@ -104,8 +104,8 @@ Instance *inst; inst = gcc-data; - e_gadcon_client_aspect_set(gcc, 24, 16); - e_gadcon_client_min_size_set(gcc, 24, 16); + e_gadcon_client_aspect_set(gcc, 16, 16); + e_gadcon_client_min_size_set(gcc, 16, 16); } static char * _gc_label(void) ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes Modified Files: language.edc Log Message: * Changing the size of the images. === RCS file: /cvs/e/e_modules/language/data/themes/language.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- language.edc29 May 2006 21:09:43 - 1.2 +++ language.edc30 May 2006 10:41:22 - 1.3 @@ -267,14 +267,15 @@ mouse_events: 0; description { state: default 0.0; + //aspect: 1.0 1.0; align: 0.5 0.5; rel1 { to: title_bar; - offset: 6 6; + offset: 4 0; } rel2 { to: title_bar; - offset: -7 -7; + offset: -5 -1; } color: 0 0 0 0; } @@ -284,11 +285,11 @@ align: 0.5 0.5; rel1 { to: title_bar; - offset: 6 6; + offset: 4 0; } rel2 { to: title_bar; - offset: -7 -7; + offset: -5 -1; } color: 0 0 0 0; } ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes/images Modified Files: AFG_flag.png ALB_flag.png AND_flag.png ARA_flag.png ARM_flag.png AZE_flag.png BAN_flag.png BEL_flag.png BGR_flag.png BHU_flag.png BIH_flag.png BLR_flag.png BRA_flag.png CAN_flag.png CHE_flag.png CZE_flag.png DEU_flag.png DNK_flag.png EPO_flag.png ESP_flag.png EST_flag.png FAO_flag.png FIN_flag.png FRA_flag.png GBR_flag.png GEO_flag.png GHA_flag.png GRE_flag.png HRV_flag.png HUN_flag.png IND_flag.png IRL_flag.png IRN_flag.png ISL_flag.png ISR_flag.png ITA_flag.png JPN_flag.png KAZ_flag.png KHM_flag.png KYR_flag.png LAO_flag.png LTU_flag.png LVA_flag.png MAL_flag.png MAO_flag.png MKD_flag.png MLT_flag.png MMR_flag.png MNG_flag.png NLD_flag.png NOR_flag.png PAK_flag.png POL_flag.png PRT_flag.png ROU_flag.png RUS_flag.png SCG_flag.png SRL_flag.png SVK_flag.png SVN_flag.png SWE_flag.png SYR_flag.png THA_flag.png TJK_flag.png TUR_flag.png UKR_flag.png USA_flag.png UZB_flag.png VNM_flag.png ZAR_flag.png unknown_flag.png Log Message: * Changing the size of the images. === RCS file: /cvs/e/e_modules/language/data/themes/images/AFG_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsTGvmLf and /tmp/cvsssb2In differ === RCS file: /cvs/e/e_modules/language/data/themes/images/ALB_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvszH2wcj and /tmp/cvsQkTTbr differ === RCS file: /cvs/e/e_modules/language/data/themes/images/AND_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs9mb6Rh and /tmp/cvsKh02Sp differ === RCS file: /cvs/e/e_modules/language/data/themes/images/ARA_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsFY5Jnl and /tmp/cvsEsyiqt differ === RCS file: /cvs/e/e_modules/language/data/themes/images/ARM_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsbCJe3j and /tmp/cvsablm7r differ === RCS file: /cvs/e/e_modules/language/data/themes/images/AZE_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsdsPqfn and /tmp/cvsS5w6kv differ === RCS file: /cvs/e/e_modules/language/data/themes/images/BAN_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsDA3YVl and /tmp/cvsWRrh3t differ === RCS file: /cvs/e/e_modules/language/data/themes/images/BEL_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs5tIG6m and /tmp/cvsCpizfv differ === RCS file: /cvs/e/e_modules/language/data/themes/images/BGR_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsdZdouq and /tmp/cvskKjUEy differ === RCS file: /cvs/e/e_modules/language/data/themes/images/BHU_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsVe4mZo and /tmp/cvsYQ2sbx differ === RCS file: /cvs/e/e_modules/language/data/themes/images/BIH_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs5kvXxs and /tmp/cvsw2NHLA differ === RCS file: /cvs/e/e_modules/language/data/themes/images/BLR_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvseqCRUj and /tmp/cvsV2Xeas differ === RCS file: /cvs/e/e_modules/language/data/themes/images/BRA_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsSXgiAi and /tmp/cvsNm8jRq differ === RCS file: /cvs/e/e_modules/language/data/themes/images/CAN_flag.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvssP6b1l and /tmp/cvslGvQju differ
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_lang.c e_mod_main.c Log Message: bugfixx === RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_mod_lang.c27 May 2006 22:05:08 - 1.23 +++ e_mod_lang.c30 May 2006 10:51:26 - 1.24 @@ -44,6 +44,11 @@ if (!cfg) return; + if (!cfg-languages) + { + language_face_language_indicator_update(); + return; + } if (cfg-lang_policy == LS_GLOBAL_POLICY) { === RCS file: /cvs/e/e_modules/language/src/module/e_mod_main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_mod_main.c30 May 2006 10:41:22 - 1.16 +++ e_mod_main.c30 May 2006 10:51:26 - 1.17 @@ -339,7 +339,7 @@ } else { -snprintf(lbuf, sizeof(lbuf), %s/images/%s.png, +snprintf(lbuf, sizeof(lbuf), %s/images/unknown_flag.png, e_module_dir_get(language_config-module)); e_icon_file_set(inst-o_flag, lbuf); edje_object_part_swallow(inst-o_language, language_flag, inst-o_flag); ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes Modified Files: language.edc Log Message: bugfixx === RCS file: /cvs/e/e_modules/language/data/themes/language.edc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- language.edc30 May 2006 10:41:22 - 1.3 +++ language.edc30 May 2006 10:51:26 - 1.4 @@ -399,12 +399,12 @@ color: 255 255 255 255; color3: 0 0 0 128; text { - text:ENG; + text:; font:Edje-Vera-Bold; size:10; align: 0.5 0.5; min: 1 1; - text_class: module_normal; + text_class: module_small; } } } ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes Modified Files: Makefile.am language.edc Log Message: * Adding flag images. * todo -- === RCS file: /cvs/e/e_modules/language/data/themes/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 27 May 2006 23:10:59 - 1.2 +++ Makefile.am 29 May 2006 21:09:43 - 1.3 @@ -1,5 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in +SUBDIRS = images + EDJE_CC = @edje_cc@ EDJE_FLAGS = -v -id ./images === RCS file: /cvs/e/e_modules/language/data/themes/language.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- language.edc15 May 2006 19:31:01 - 1.1 +++ language.edc29 May 2006 21:09:43 - 1.2 @@ -5,12 +5,11 @@ image: language_titlebar_glint1.png COMP; image: language_titlebar_glint2.png COMP; image: language_titlebar_glint3.png COMP; - image: language_flag.png COMP; } collections { group { name: modules/language/main; - max: 128 128; + max: 148 128; script { public is_active; public is_hilited; @@ -94,36 +93,6 @@ color: 255 255 255 255; } } -// part { -// name: language_flag; -// description { -//state: default 0.0; -//aspect: 1.0 1.0; -//rel1 { -// to: title_bar; -// offset: 0 0; -//} -//rel2 { -// to: title_bar; -// offset: -1 -1; -//} -//image { -// normal: language_flag.png; -//} -// } -// description { -//state: active 0.0; -//inherit: default 0.0; -//rel1 { -// to: title_bar; -// offset: 7 7; -//} -//rel2 { -// to: title_bar; -// offset: -8 -8; -//} -// } -// } part { name: title_glint_clip; @@ -291,7 +260,71 @@ color:255 255 255 255; } } + +part { + name: language_flag; + type: SWALLOW; + mouse_events: 0; + description { + state: default 0.0; + align: 0.5 0.5; + rel1 { + to: title_bar; + offset: 6 6; + } + rel2 { + to: title_bar; + offset: -7 -7; + } + color: 0 0 0 0; + } + description { + state: active 0.0; + inherit: default 0.0; + align: 0.5 0.5; + rel1 { + to: title_bar; + offset: 6 6; + } + rel2 { + to: title_bar; + offset: -7 -7; + } + color: 0 0 0 0; + } +} +// part { +// name: language_flag; +// description { +//state: default 0.0; +//aspect: 1.0 1.0; +//rel1 { +// to: title_bar; +// offset: 0 0; +//} +//rel2 { +// to: title_bar; +// offset: -1 -1; +//} +//image { +// normal: language_flag.png; +//} +// } +// description { +//state: active 0.0; +//inherit: default 0.0; +//rel1 { +// to: title_bar; +// offset: 7 7; +//} +//rel2 { +// to: title_bar; +// offset: -8 -8; +//} +// } +// } +// // part { // name: language_flag2; // mouse_events: 0; --- All the advantages of Linux Managed Hosting--Without the Cost and Risk! Fully trained technicians. The highest number of Red Hat certifications in the hosting industry. Fanatical Support. Click to learn more http://sel.as-us.falkag.net/sel?cmd=lnkkid=107521bid=248729dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes/images Added Files: AFG_flag.png ALB_flag.png AND_flag.png ARA_flag.png ARM_flag.png AZE_flag.png BAN_flag.png BEL_flag.png BGR_flag.png BHU_flag.png BIH_flag.png BLR_flag.png BRA_flag.png CAN_flag.png CHE_flag.png CZE_flag.png DEU_flag.png DNK_flag.png EPO_flag.png ESP_flag.png EST_flag.png FAO_flag.png FIN_flag.png FRA_flag.png GBR_flag.png GEO_flag.png GHA_flag.png GRE_flag.png HRV_flag.png HUN_flag.png IND_flag.png IRL_flag.png IRN_flag.png ISL_flag.png ISR_flag.png ITA_flag.png JPN_flag.png KAZ_flag.png KHM_flag.png KYR_flag.png LAO_flag.png LTU_flag.png LVA_flag.png MAL_flag.png MAO_flag.png MKD_flag.png MLT_flag.png MMR_flag.png MNG_flag.png Makefile.am NLD_flag.png NOR_flag.png PAK_flag.png POL_flag.png PRT_flag.png ROU_flag.png RUS_flag.png SCG_flag.png SRL_flag.png SVK_flag.png SVN_flag.png SWE_flag.png SYR_flag.png THA_flag.png TJK_flag.png TUR_flag.png UKR_flag.png USA_flag.png UZB_flag.png VNM_flag.png ZAR_flag.png unknown_flag.png Log Message: * Adding flag images. * todo -- --- All the advantages of Linux Managed Hosting--Without the Cost and Risk! Fully trained technicians. The highest number of Red Hat certifications in the hosting industry. Fanatical Support. Click to learn more http://sel.as-us.falkag.net/sel?cmd=lnkkid=107521bid=248729dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_config.c e_mod_main.c Log Message: * Adding flag images. * todo -- === RCS file: /cvs/e/e_modules/language/src/module/e_mod_config.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_config.c 27 May 2006 22:05:08 - 1.14 +++ e_mod_config.c 29 May 2006 21:09:44 - 1.15 @@ -357,6 +357,7 @@ { //FIXME: optimize - too slow char buf[1024]; + char lbuf[1024]; Evas_List*l, *l2; Language_Predef *lp; Language *lang; @@ -395,8 +396,10 @@ snprintf(buf, sizeof(buf), ILIST_LANGUAGE_LABEL_FORMAT, lp-lang_name, lp-lang_shortcut); - ic = edje_object_add(cfdata-evas); - e_util_edje_icon_set(ic, enlightenment/e); + ic = e_icon_add(cfdata-evas); + snprintf(lbuf, sizeof(lbuf), %s/images/%s.png, e_module_dir_get(cfdata-conf-module), + lp-lang_flag); + e_icon_file_set(ic, lbuf); e_widget_ilist_append(cfdata-gui.lang_ilist, ic, buf, NULL, NULL, NULL); } @@ -423,6 +426,7 @@ { //FIXME: optimize - too slow char buf[1024]; + char lbuf[1024]; Evas_List *l; Language*lang; int indx; @@ -443,8 +447,10 @@ snprintf(buf, sizeof(buf), ILIST_LANGUAGE_LABEL_FORMAT, lang-lang_name, lang-lang_shortcut); - ic = edje_object_add(cfdata-evas); - e_util_edje_icon_set(ic, enlightenment/e); + ic = e_icon_add(cfdata-evas); + snprintf(lbuf, sizeof(lbuf), %s/images/%s.png, e_module_dir_get(cfdata-conf-module), + lang-lang_flag); + e_icon_file_set(ic, lbuf); e_widget_ilist_append(cfdata-gui.selected_lang_ilist, ic, buf, NULL, NULL, NULL); } === RCS file: /cvs/e/e_modules/language/src/module/e_mod_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.c27 May 2006 22:05:08 - 1.14 +++ e_mod_main.c29 May 2006 21:09:44 - 1.15 @@ -48,6 +48,7 @@ { E_Gadcon_Client *gcc; Evas_Object *o_language; + Evas_Object *o_flag; }; static E_Gadcon_Client * @@ -73,6 +74,12 @@ inst-gcc = gcc; inst-o_language = o; + inst-o_flag = e_icon_add(gc-evas); + snprintf(buf, sizeof(buf), %s/images/unknown_flag.png, + e_module_dir_get(language_config-module)); + e_icon_file_set(inst-o_flag, buf); + edje_object_part_swallow(inst-o_language, language_flag, inst-o_flag); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _lang_button_cb_mouse_down, inst); @@ -88,6 +95,7 @@ inst = gcc-data; language_config-instances = evas_list_remove(language_config-instances, inst); evas_object_del(inst-o_language); + evas_object_del(inst-o_flag); free(inst); } static void @@ -96,8 +104,8 @@ Instance *inst; inst = gcc-data; - e_gadcon_client_aspect_set(gcc, 16, 16); - e_gadcon_client_min_size_set(gcc, 16, 16); + e_gadcon_client_aspect_set(gcc, 24, 16); + e_gadcon_client_min_size_set(gcc, 24, 16); } static char * _gc_label(void) @@ -142,9 +150,6 @@ E_CONFIG_VAL(D, T, rdefs.model, STR); E_CONFIG_VAL(D, T, rdefs.layout, STR); E_CONFIG_VAL(D, T, rdefs.variant, STR); - /*E_CONFIG_VAL(D, T, kbd_model, STR); - E_CONFIG_VAL(D, T, kbd_layout, STR); - E_CONFIG_VAL(D, T, kbd_variant, STR);*/ conf_edd = E_CONFIG_DD_NEW(Language_Config, Config); #undef T @@ -309,6 +314,7 @@ Evas_List *l; Instance*inst; static int counter = 0; + char lbuf[4096]; if (!language_config) return; @@ -316,15 +322,30 @@ for (l = language_config-instances; l; l = l-next) { inst = l-data; + Evas_Coord mw, mh; + evas_object_hide(inst-o_flag); + edje_object_part_unswallow(inst-o_language, inst-o_flag); if (language_config-languages) { Language *lang = evas_list_nth(language_config-languages, language_config-language_selector); -edje_object_part_text_set(inst-o_language, langout, lang-lang_shortcut); + +snprintf(lbuf, sizeof(lbuf), %s/images/%s.png, + e_module_dir_get(language_config-module), lang-lang_flag); +e_icon_file_set(inst-o_flag, lbuf); +edje_object_part_swallow(inst-o_language, language_flag, inst-o_flag); +edje_object_part_text_set(inst-o_language, langout, lang-lang_shortcut); } else - edje_object_part_text_set(inst-o_language, langout, ); + { +snprintf(lbuf, sizeof(lbuf), %s/images/%s.png, +
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO configure.in module.eap module_icon.png Log Message: * Adding flag images. * todo -- === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- TODO27 May 2006 22:06:38 - 1.16 +++ TODO29 May 2006 21:09:43 - 1.17 @@ -3,12 +3,4 @@ 1. Remove all FIXMEs. -2. Introduce country flags for the face box, and for the list icons in the config - dialog and in the face menu. - -3. Think on language switch policy : - a) Global - done - b) Per Window - done - c) - -4. Memleaks? forget somewere to clear list or remove an item from it? +2. Memleaks? forget somewere to clear list or remove an item from it? === RCS file: /cvs/e/e_modules/language/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in27 May 2006 23:10:59 - 1.4 +++ configure.in29 May 2006 21:09:43 - 1.5 @@ -149,6 +149,7 @@ src/module/Makefile data/Makefile data/themes/Makefile +data/themes/images/Makefile ],[ ]) === RCS file: /cvs/e/e_modules/language/module.eap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsdQuvhH and /tmp/cvstZu8la differ === RCS file: /cvs/e/e_modules/language/module_icon.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsXE0xzK and /tmp/cvsXqYIFd differ --- All the advantages of Linux Managed Hosting--Without the Cost and Risk! Fully trained technicians. The highest number of Red Hat certifications in the hosting industry. Fanatical Support. Click to learn more http://sel.as-us.falkag.net/sel?cmd=lnkkid=107521bid=248729dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes/images Added Files: .cvsignore Log Message: .cvsignore --- All the advantages of Linux Managed Hosting--Without the Cost and Risk! Fully trained technicians. The highest number of Red Hat certifications in the hosting industry. Fanatical Support. Click to learn more http://sel.as-us.falkag.net/sel?cmd=lnkkid=107521bid=248729dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_config.c e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h Log Message: More work on module. Now, the window policy should work fine, and fast as possible. Ofcourse, in order, to get this seed it would be nice do E update. === RCS file: /cvs/e/e_modules/language/src/module/e_mod_config.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_config.c 23 May 2006 09:41:18 - 1.13 +++ e_mod_config.c 27 May 2006 22:05:08 - 1.14 @@ -185,7 +185,7 @@ e_widget_on_change_hook_set(ob, _lang_kbd_model_ilist_cb_change, cfdata); cfdata-gui.kbd_model_ilist = ob; { - e_widget_min_size_set(ob, 380, 80); + e_widget_min_size_set(ob, 390, 80); e_widget_ilist_go(ob); } e_widget_framelist_object_append(of, ob); @@ -269,14 +269,14 @@ for (l = cfdata-selected_languages; l; l = l-next) { lang = lang_language_copy(l-data); + lang_language_xorg_values_get(lang); if (lang) cfdata-conf-languages = evas_list_append(cfdata-conf-languages, lang); } cfdata-conf-language_selector = 0; e_config_save_queue(); - //e_config_save(); - lang_language_switch_to(cfdata-conf, (cfdata-conf-language_selector = 0), 0); + lang_language_switch_to(cfdata-conf, (cfdata-conf-language_selector = 0)); return 1; } static void @@ -485,7 +485,7 @@ { lkm = l-data; -if (!strcmp(lkm-kbd_model, selected_lang-kbd_model)) +if (!strcmp(lkm-kbd_model, selected_lang-rdefs.model)) kbd_model_indx = i; //snprintf(buf, sizeof(buf), %s (%s), lkm-kbd_model_desctiption, lkm-kbd_model); @@ -499,7 +499,7 @@ l; l = l-next, kbd_model_indx++) { lkm = l-data; -if (!strcmp(lkm-kbd_model, selected_lang-kbd_model)) +if (!strcmp(lkm-kbd_model, selected_lang-rdefs.model)) break; } if (!l) @@ -541,7 +541,8 @@ char *variant = l-data; if (!strcmp(variant, basic)) continue; - if (selected_lang-kbd_variant !strcmp(selected_lang-kbd_variant, variant)) + if (selected_lang-rdefs.variant + !strcmp(selected_lang-rdefs.variant, variant)) kbd_variant_indx = i; e_widget_ilist_append(cfdata-gui.kbd_layout_variant_ilist, @@ -588,13 +589,14 @@ lang = E_NEW(Language, 1); if (!lang) return; - lang-id = evas_list_count(cfdata-selected_languages); - lang-lang_name = evas_stringshare_add(lp-lang_name); + lang-id = evas_list_count(cfdata-selected_languages); + lang-lang_name = evas_stringshare_add(lp-lang_name); lang-lang_shortcut = evas_stringshare_add(lp-lang_shortcut); - lang-lang_flag = !(lp-lang_flag) ? NULL : evas_stringshare_add(lp-lang_flag); - lang-kbd_model = lang_language_current_kbd_model_get(); - lang-kbd_layout = evas_stringshare_add(lp-kbd_layout); - lang-kbd_variant = evas_stringshare_add(basic); + lang-lang_flag = !(lp-lang_flag) ? NULL : evas_stringshare_add(lp-lang_flag); + lang-rdefs.model = (char *) evas_stringshare_add(lang_language_current_kbd_model_get()); + lang-rdefs.layout = (char *) evas_stringshare_add(lp-kbd_layout); + lang-rdefs.variant = (char *) evas_stringshare_add(basic); + //lang_language_xorg_values_get(lang); cfdata-selected_languages = evas_list_append(cfdata-selected_languages, lang); //DO NOT sort selected_languages list. Here the sequence of the langs is essential! @@ -742,8 +744,9 @@ if (!lang || !lkm) return; - if (lang-kbd_model) evas_stringshare_del(lang-kbd_model); - lang-kbd_model = evas_stringshare_add(lkm-kbd_model); + if (lang-rdefs.model) evas_stringshare_del(lang-rdefs.model); + lang-rdefs.model = (char *) evas_stringshare_add(lkm-kbd_model); + //lang_language_xorg_values_get(lang); } static void _lang_kbd_layout_variant_ilist_cb_change(void *data, Evas_Object *obj) @@ -763,8 +766,9 @@ lang = evas_list_nth(cfdata-selected_languages, indx_lang); if (indx_variant == 0) { - if (lang-kbd_variant) evas_stringshare_del(lang-kbd_variant); - lang-kbd_variant = evas_stringshare_add(basic); + if (lang-rdefs.variant) evas_stringshare_del(lang-rdefs.variant); + lang-rdefs.variant = (char *) evas_stringshare_add(basic); + //lang_language_xorg_values_get(lang); return; } else @@ -780,8 +784,9 @@ { variant = evas_list_nth(lp-kbd_variant, indx_variant - 1); - if (lang-kbd_variant)
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO Log Message: todo -- === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- TODO23 May 2006 09:41:18 - 1.15 +++ TODO27 May 2006 22:06:38 - 1.16 @@ -1,18 +1,14 @@ -0. Optimize language switching functionality. It is too slow for per window policy. - -1. Fix the configure.in file in order to have dependencies to X11 and xkbfile +0. Fix the configure.in file in order to have dependencies to X11 and xkbfile libraries. -2. Remove all FIXMEs. - -3. Fix the lang_language_current_kbd_model_get() to return the actual value. +1. Remove all FIXMEs. -4. Introduce country flags for the face box, and for the list icons in the config +2. Introduce country flags for the face box, and for the list icons in the config dialog and in the face menu. -5. Think on language switch policy : - a) Global - b) Per Window +3. Think on language switch policy : + a) Global - done + b) Per Window - done c) -6. Memleaks? forget somewere to clear list or remove an item from it? +4. Memleaks? forget somewere to clear list or remove an item from it? --- All the advantages of Linux Managed Hosting--Without the Cost and Risk! Fully trained technicians. The highest number of Red Hat certifications in the hosting industry. Fanatical Support. Click to learn more http://sel.as-us.falkag.net/sel?cmd=lnkkid=107521bid=248729dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_config.c e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h Log Message: * new policy per window is added. unfortunatelly, it works a little bit slowly for now, but this will be fixed. === RCS file: /cvs/e/e_modules/language/src/module/e_mod_config.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_config.c 18 May 2006 16:32:17 - 1.12 +++ e_mod_config.c 23 May 2006 09:41:18 - 1.13 @@ -121,6 +121,7 @@ static Evas_Object * _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { + E_Radio_Group *rg; Evas_Object *o, *of, *ob, *ot, *ot2, *oft; cfdata-evas = evas; @@ -137,7 +138,7 @@ ob = e_widget_ilist_add(evas, ILIST_ICON_LANG_WIDTH, ILIST_ICON_LANG_HEIGHT, NULL); e_widget_on_change_hook_set(ob, _lang_languages_ilist_cb_change, cfdata); cfdata-gui.lang_ilist = ob; - e_widget_min_size_set(ob, 250, 250); + e_widget_min_size_set(ob, 250, 170); e_widget_ilist_go(ob); e_widget_framelist_object_append(of, ob); } @@ -150,7 +151,7 @@ ob = e_widget_ilist_add(evas, ILIST_ICON_WIDTH, ILIST_ICON_HEIGHT, NULL); e_widget_on_change_hook_set(ob, _lang_selected_languages_ilist_cb_change, cfdata); cfdata-gui.selected_lang_ilist = ob; - e_widget_min_size_set(ob, 250, 250); + e_widget_min_size_set(ob, 250, 170); e_widget_ilist_go(ob); e_widget_frametable_object_append(oft, ob, 0, 0, 4, 1, 1, 1, 1, 1); @@ -184,7 +185,7 @@ e_widget_on_change_hook_set(ob, _lang_kbd_model_ilist_cb_change, cfdata); cfdata-gui.kbd_model_ilist = ob; { - e_widget_min_size_set(ob, 380, 100); + e_widget_min_size_set(ob, 380, 80); e_widget_ilist_go(ob); } e_widget_framelist_object_append(of, ob); @@ -197,7 +198,7 @@ e_widget_on_change_hook_set(ob, _lang_kbd_layout_variant_ilist_cb_change, cfdata); cfdata-gui.kbd_layout_variant_ilist = ob; { - e_widget_min_size_set(ob, 120, 100); + e_widget_min_size_set(ob, 120, 80); e_widget_ilist_go(ob); } e_widget_framelist_object_append(of, ob); @@ -208,11 +209,26 @@ } e_widget_list_object_append(o, ot, 1, 1, 0.5); - /*of = e_widget_framelist_add(evas, _(Options), 0); - ob = e_widget_check_add(evas, _(Show Language Indicator), ((cfdata-lang_show_indicator))); - e_widget_framelist_object_append(of, ob); + - e_widget_list_object_append(o, of, 1, 1, 0.5);*/ + of = e_widget_framelist_add(evas, _(Language Switching Policy), 1); + { + rg = e_widget_radio_group_new((int *)(cfdata-lang_policy)); + + ob = e_widget_radio_add(evas, Global, LS_GLOBAL_POLICY, rg); + e_widget_framelist_object_append(of, ob); + + ob = e_widget_radio_add(evas, Window, LS_WINDOW_POLICY, rg); + e_widget_framelist_object_append(of, ob); + + ob = e_widget_radio_add(evas, Application, LS_APPLICATION_POLICY, rg); + e_widget_framelist_object_append(of, ob); + e_widget_disabled_set(ob, 1); + } + + e_widget_list_object_append(o, of, 1, 1, 0.5); + + // _lang_update_lang_defined_list(cfdata); _lang_update_selected_lang_list(cfdata); @@ -231,6 +247,17 @@ Language*lang, *lang2; cfdata-conf-lang_policy = cfdata-lang_policy; + if (cfdata-conf-lang_policy == LS_GLOBAL_POLICY) + { + language_clear_border_language_setup_list(); + language_unregister_callback_handlers(); + } + else if (cfdata-conf-lang_policy == LS_WINDOW_POLICY || + cfdata-conf-lang_policy == LS_APPLICATION_POLICY) + { + language_register_callback_handlers(); + } + cfdata-conf-lang_show_indicator = cfdata-lang_show_indicator; while (cfdata-conf-languages) @@ -246,10 +273,10 @@ cfdata-conf-languages = evas_list_append(cfdata-conf-languages, lang); } cfdata-conf-language_selector = 0; - //e_config_save_queue(); - e_config_save(); + e_config_save_queue(); + //e_config_save(); - lang_language_switch_to(cfdata-conf, cfdata-conf-language_selector = 0); + lang_language_switch_to(cfdata-conf, (cfdata-conf-language_selector = 0), 0); return 1; } static void === RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_mod_lang.c18 May 2006 15:00:30 - 1.21 +++ e_mod_lang.c23
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO Log Message: * new policy per window is added. unfortunatelly, it works a little bit slowly for now, but this will be fixed. === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- TODO18 May 2006 15:04:53 - 1.14 +++ TODO23 May 2006 09:41:18 - 1.15 @@ -1,3 +1,4 @@ +0. Optimize language switching functionality. It is too slow for per window policy. 1. Fix the configure.in file in order to have dependencies to X11 and xkbfile libraries. @@ -13,3 +14,5 @@ a) Global b) Per Window c) + +6. Memleaks? forget somewere to clear list or remove an item from it? --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: Tag: 1.21 e_mod_lang.c Log Message: some fixes related to X paths --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO Log Message: todo === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- TODO17 May 2006 22:51:24 - 1.13 +++ TODO18 May 2006 15:04:53 - 1.14 @@ -2,15 +2,13 @@ 1. Fix the configure.in file in order to have dependencies to X11 and xkbfile libraries. -2. Remove all FIXMEs. Especially in e_mod_lang.c since the code the paths to - X files are hardcoded. That is not ok. +2. Remove all FIXMEs. 3. Fix the lang_language_current_kbd_model_get() to return the actual value. -3. Turn on module shortcut bindings. They are turned of for a while. - 4. Introduce country flags for the face box, and for the list icons in the config dialog and in the face menu. + 5. Think on language switch policy : a) Global b) Per Window --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: Tag: 1.12 e_mod_config.c e_mod_main.c Log Message: * fixing some UI consistency issues. --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO Log Message: So, finally, the module is able to switch between selected languages. I hope it will work for everybody, since some paths to X files are hard coded and they can not to exist in different versions of Xorg. Moreover, the current implementation is connected to my Xorg7.0. Basically, I cannot predict the behavior of the module on older Xorg versions. Please Just try the module, and report any problems/bugs to me. === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- TODO15 May 2006 19:28:21 - 1.11 +++ TODO17 May 2006 22:26:00 - 1.12 @@ -1,8 +1,15 @@ -* Turn on module shortcut bindings. They are turned of for a while -* Introduce country flags for the face box, and for the list icons in the config - dialog and in the face menu. -* Think on language switch policy : - a) Global - b) Per Window - c) +1. Fix the configure.in file in order to have dependencies to X11 and xkbfile + libraries. + +2. Remove all FIXMEs. Especially in e_mod_lang.c since the code the paths to + X files are hardcoded. That is not ok. + +3. Turn on module shortcut bindings. They are turned of for a while + +4. Introduce country flags for the face box, and for the list icons in the config + dialog and in the face menu. +5. Think on language switch policy : + a) Global + b) Per Window + c) --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: e_mod_config.c e_mod_keybind.c e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h language.edc Added Files: README.in Log Message: * config dialog, more or less, is done. === RCS file: /cvs/e/e_modules/language/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 12 May 2006 11:02:31 - 1.2 +++ e_mod_config.c 12 May 2006 22:35:50 - 1.3 @@ -4,6 +4,9 @@ #include e_mod_config.h #include config.h +#define ILIST_ICON_LANG_WIDTH 35 +#define ILIST_ICON_LANG_HEIGHT 35 + #define ILIST_ICON_WIDTH 32 #define ILIST_ICON_HEIGHT 32 @@ -26,10 +29,12 @@ Evas_Object *lang_ilist; Evas_Object *btn_add; Evas_Object *btn_del; + Evas_Object *btn_move_up; + Evas_Object *btn_move_down; Evas_Object *selected_lang_ilist; Evas_Object *kbd_model_ilist; - Evas_Object *kbd_layout_ilist; - Evas_Object *layout_variant_ilist; + //Evas_Object *kbd_layout_ilist; + Evas_Object *kbd_layout_variant_ilist; } gui; }; @@ -49,15 +54,23 @@ /* private functionality / static void _lang_update_lang_defined_list(E_Config_Dialog_Data *cfdata); static void _lang_update_selected_lang_list(E_Config_Dialog_Data *cfdata); +static void _lang_update_kbd_model_list(E_Config_Dialog_Data *cfdata); +static void _lang_update_kbd_layout_variant_list(E_Config_Dialog_Data *cfdata); + static void _lang_update_select_button(E_Config_Dialog_Data *cfdata); static void _lang_update_unselect_button(E_Config_Dialog_Data *cfdata); +static void _lang_update_language_moveup_button(E_Config_Dialog_Data *cfdata); +static void _lang_update_language_movedown_button(E_Config_Dialog_Data *cfdata); static void _lang_select_language_cb(void *data, void *data2); static void _lang_unselect_language_cb(void *data, void *data2); +static void _lang_move_language_order_up_cb(void *data, void *data2); +static void _lang_move_language_order_down_cb(void *data, void *data2); + static void _lang_languages_ilist_cb_change(void *data, Evas_Object *obj); static void _lang_selected_languages_ilist_cb_change(void *data, Evas_Object *obj); - -void _lang_update_kbd_model_list(E_Config_Dialog_Data *cfdata); +static void _lang_kbd_model_ilist_cb_change(void *data, Evas_Object *obj); +static void _lang_kbd_layout_variant_ilist_cb_change(void *data, Evas_Object *obj); static void _lang_free_language(Language *lang); // @@ -83,7 +96,7 @@ { Evas_List *ll; Language*lang, *lang2; - + cfdata-lang_policy = l-conf-lang_policy; cfdata-lang_show_indicator = l-conf-lang_show_indicator; @@ -94,6 +107,7 @@ lang2 = E_NEW(Language, 1); if (!lang2) continue; + lang2-id = lang-id; lang2-lang_name = evas_stringshare_add(lang-lang_name); lang2-lang_shortcut = evas_stringshare_add(lang-lang_shortcut); lang2-lang_flag = !(lang-lang_flag) ? NULL : evas_stringshare_add(lang-lang_flag); @@ -104,6 +118,34 @@ cfdata-selected_languages = evas_list_append(cfdata-selected_languages, lang2); } + if (!cfdata-selected_languages) + { + for (ll = language_def_list; ll; ll = ll-next) + { +Language_Def *ld = ll-data; + +if (!strcmp(ld-kbd_layout, us)) + { + lang = E_NEW(Language, 1); + if (!lang) + break; + + lang-id = 0; + lang-lang_name = evas_stringshare_add(ld-lang_name); + lang-lang_shortcut = evas_stringshare_add(ld-lang_shortcut); + lang-lang_flag = evas_stringshare_add(ld-lang_flag); + //FIXME: get current model from config. + lang-kbd_model = evas_stringshare_add(compaqik13); + lang-kbd_layout = evas_stringshare_add(ld-kbd_layout); + lang-kbd_variant = evas_stringshare_add(basic); + + cfdata-selected_languages = evas_list_append(cfdata-selected_languages, lang); + + break; + } + } + } + } static void * @@ -116,10 +158,8 @@ cfdata = E_NEW(E_Config_Dialog_Data, 1); //cfdata-lang = l; - _fill_data(l, cfdata); - lang_load_kbd_models(); - lang_load_xfree_languages(); + _fill_data(l, cfdata); return cfdata; } @@ -136,9 +176,6 @@ cfdata-selected_languages); } - lang_free_kbd_models(); - lang_free_xfree_languages(); - l = cfd-data; l-cfd = NULL; free(cfdata); @@ -157,95 +194,97 @@ ot = e_widget_table_add(evas, 0);
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data Log Message: Directory /cvs/e/e_modules/language/data added to the repository --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src Log Message: Directory /cvs/e/e_modules/language/src added to the repository --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data Added Files: Makefile.am Log Message: --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data Added Files: .cvsignore Log Message: .cvsignore --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes/images Added Files: language_flag.png language_titlebar.png language_titlebar_glint1.png language_titlebar_glint2.png language_titlebar_glint3.png language_titlebar_shadow1.png language_titlebar_shadow2.png Log Message: --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes Added Files: Makefile.am language.edc Log Message: --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: Makefile.am TODO configure.in module_icon.png Log Message: * moving the module to shelf. * source tree reorganization === RCS file: /cvs/e/e_modules/language/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 12 May 2006 11:02:31 - 1.2 +++ Makefile.am 15 May 2006 19:28:21 - 1.3 @@ -1,41 +1,16 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = - -EDJE_CC = @edje_cc@ -EDJE_FLAGS = -v - -EXTRA_DIST = $(files_DATA) language.png +SUBDIRS = src data # data files for the module filesdir = $(datadir) files_DATA = \ -module_icon.png \ -language.edj \ -language.edc +module.eap \ +module_icon.png -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(includedir) \ - @e_cflags@ +EXTRA_DIST = $(files_DATA) pkgdir= $(datadir)/$(MODULE_ARCH) -pkg_LTLIBRARIES= module.la -module_la_SOURCES = e_mod_main.c \ - e_mod_main.h \ - e_mod_config.c \ - e_mod_config.h \ -e_mod_keybind.h \ -e_mod_keybind.c \ -e_mod_lang.h \ -e_mod_lang.c -module_la_LIBADD = @e_libs@ -lexml -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -language.edj: Makefile language.edc - $(EDJE_CC) $(EDJE_FLAGS) language.edc language.edj clean-local: - rm -rf *.edj *~ + rm -rf *~ === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- TODO13 May 2006 19:34:34 - 1.10 +++ TODO15 May 2006 19:28:21 - 1.11 @@ -1,9 +1,7 @@ -* Switch language on mouse click on module. +* Turn on module shortcut bindings. They are turned of for a while * Introduce country flags for the face box, and for the list icons in the config dialog and in the face menu. -* Center the language indicator in the box. Maybe do it 2 letter long instead of 3. -* Make module shelf compatible. * Think on language switch policy : a) Global b) Per Window === RCS file: /cvs/e/e_modules/language/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in12 May 2006 11:02:31 - 1.2 +++ configure.in15 May 2006 19:28:21 - 1.3 @@ -144,6 +144,10 @@ AC_OUTPUT([ Makefile +src/Makefile +src/module/Makefile +data/Makefile +data/themes/Makefile ],[ ]) === RCS file: /cvs/e/e_modules/language/module_icon.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs9Hd6Yh and /tmp/cvsXmaSlK differ --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Added Files: module.eap Log Message: ooopppss, forgot to add it :) --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Log Message: Directory /cvs/e/e_modules/language/src/module added to the repository --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes/images Log Message: Directory /cvs/e/e_modules/language/data/themes/images added to the repository --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes Log Message: Directory /cvs/e/e_modules/language/data/themes added to the repository --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Added Files: Makefile.am e_mod_config.c e_mod_config.h e_mod_keybindings.c e_mod_keybindings.h e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h Log Message: * moving module to shelf * code tree reorganization --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src Added Files: Makefile.am Log Message: * moving module to shelf * code tree reorganization --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Removed Files: e_mod_config.c e_mod_config.h e_mod_keybind.c e_mod_keybind.h e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h language.edc language.png Log Message: * removing files that are moved to src/module directory --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/data/themes Added Files: .cvignore Log Message: .cvsignore --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src Added Files: .cvsignore Log Message: .cvsignore --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: Tag: 1.41 e_mod_config.c e_mod_keybind.c e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h Log Message: More work on the module. * The config dialog is almost finished. * The user interface should work fine. * The config is stored an load properly. --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Added Files: Tag: 1.10 TODO Log Message: todo --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Log Message: Directory /cvs/e/e_modules/language added to the repository --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README autogen.sh configure.in e_mod_config.c e_mod_config.h e_mod_keybind.c e_mod_keybind.h e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h language.edc language.png module_icon.png Log Message: Starting a new 'language' module. This module will allow to control the keyboard layout, keyboard model, and keyboard layout variant. All this parameters correspond to setxkbmap program -model, -layout, -variant options. Moreover, the module will provide a visual control of the current input language (keyboard model, keyboard layout, keyboard layout variant). For now, this is only a skeleton version of the module. However, it is already provides some functionality : 1. visual gadget. 2. registered key bindings. 3. a skeleton config dialog. So, comments from everybody are welcome. --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Added Files: .cvsignore Log Message: .cvsignore --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs