E CVS: efm_nav devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : efm_nav Dir : e_modules/efm_nav/src Modified Files: e_mod_main.h Log Message: Add missing define for gettext translations. === RCS file: /cvs/e/e_modules/efm_nav/src/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h13 Nov 2007 20:39:53 - 1.1 +++ e_mod_main.h24 Nov 2007 00:48:22 - 1.2 @@ -1,6 +1,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#define D_(str) dgettext(PACKAGE, str) + EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init (E_Module *m); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: efm_path devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : efm_path Dir : e_modules/efm_path/src Modified Files: e_mod_main.h Log Message: Add missing macro for gettext translations. === RCS file: /cvs/e/e_modules/efm_path/src/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h11 Nov 2007 19:25:19 - 1.1 +++ e_mod_main.h24 Nov 2007 00:47:05 - 1.2 @@ -1,6 +1,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#define D_(str) dgettext(PACKAGE, str) + EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init (E_Module *m); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/edje_viewer cmarcelo
Enlightenment CVS committal Author : cmarcelo Project : e17 Module : apps/edje_viewer Dir : e17/apps/edje_viewer/src/bin Modified Files: etk_gui.c Log Message: Now pressing RETURN in signal or source entries will emit the signal, just like clicking in the SEND button. === RCS file: /cvs/e/e17/apps/edje_viewer/src/bin/etk_gui.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- etk_gui.c 30 Sep 2007 02:16:55 - 1.23 +++ etk_gui.c 23 Nov 2007 19:01:33 - 1.24 @@ -29,7 +29,7 @@ static Etk_Bool _gui_main_window_deleted_cb(Etk_Window *obj, Gui *gui); static Etk_Bool _gui_tree_checkbox_toggled_cb(Etk_Object *obj, Etk_Tree_Row *row, void *data); -static Etk_Bool _gui_send_clicked_cb(Etk_Object *obj, void *data); +static Etk_Bool _gui_emit_signal_cb(Etk_Object *obj, void *data); static int gui_visibility_col_sort_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1, Etk_Tree_Row *row2, void *data); void main_window_show(const char *file) @@ -178,6 +178,9 @@ signal_entry = etk_entry_new(); etk_box_append(ETK_BOX(hbox), signal_entry, ETK_BOX_START, ETK_BOX_NONE, 0); gui->signal_entry = signal_entry; + etk_signal_connect_by_code(ETK_ENTRY_TEXT_ACTIVATED_SIGNAL, + ETK_OBJECT(signal_entry), + ETK_CALLBACK(_gui_emit_signal_cb), gui); source_label = etk_label_new("Source: "); etk_box_append(ETK_BOX(hbox), source_label, ETK_BOX_START, ETK_BOX_NONE, 0); @@ -186,13 +189,16 @@ source_entry = etk_entry_new(); etk_box_append(ETK_BOX(hbox), source_entry, ETK_BOX_START, ETK_BOX_NONE, 0); gui->source_entry = source_entry; + etk_signal_connect_by_code(ETK_ENTRY_TEXT_ACTIVATED_SIGNAL, + ETK_OBJECT(source_entry), + ETK_CALLBACK(_gui_emit_signal_cb), gui); send_button = etk_button_new_with_label("Send"); etk_button_alignment_set(ETK_BUTTON(send_button), 1.0, 0.5); etk_box_append(ETK_BOX(hbox), send_button, ETK_BOX_END, ETK_BOX_NONE, 0); etk_signal_connect_by_code(ETK_BUTTON_CLICKED_SIGNAL, ETK_OBJECT(send_button), - ETK_CALLBACK(_gui_send_clicked_cb), gui); + ETK_CALLBACK(_gui_emit_signal_cb), gui); bg_setup(ETK_CANVAS(gui->canvas)); etk_widget_show_all(gui->win); @@ -583,7 +589,7 @@ return ETK_TRUE; } -static Etk_Bool _gui_send_clicked_cb(Etk_Object *obj, void *data) +static Etk_Bool _gui_emit_signal_cb(Etk_Object *obj, void *data) { Gui * gui; Evas_List *l; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_handlers.c Log Message: Edje reference patch two (from dresb) === RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- edje_cc_handlers.c 23 Nov 2007 16:40:38 - 1.78 +++ edje_cc_handlers.c 23 Nov 2007 16:43:03 - 1.79 @@ -2,6 +2,45 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +/* +Concerning the EDC reference: + +The formatting for blocks and properties has been implemented as a table +which is filled using ALIASES. +For maximum flexibility I implemented them in the [EMAIL PROTECTED]/[EMAIL PROTECTED] style, +this means that missing one or changing the order most certainly cause +formatting errors. + +[EMAIL PROTECTED] +block name +[EMAIL PROTECTED] +code sample of the block +[EMAIL PROTECTED] +the block's description +[EMAIL PROTECTED] + +[EMAIL PROTECTED] +property name +[EMAIL PROTECTED] +property's parameter list +[EMAIL PROTECTED] +the property description (lol) +[EMAIL PROTECTED] +*/ + +/** + * @page edcref Edje Data Collection reference + * An Edje Data Collection, it's a plain text file (normally identified with the + * .edc extension),consisting of instructions for the Edje Compiler. + * + * The syntax for the edje data collection files follows a simple structure of + * "blocks { .. }" that can contain "properties: ..", more blocks, or both. + * + * @author Andres Blanc (dresb) [EMAIL PROTECTED] + * + * + */ + #include "edje_cc.h" static void st_images_image(void); @@ -462,6 +501,39 @@ /*/ +/** +@page edcref + +@block +images +@context +images { +image: "filename1.ext" COMP; +image: "filename2.ext" LOSSY 99; +.. +} +@description +The "images" block is used to list each image file that will be used in +the theme along with its compression method (if any). +Besides the domcument's root, additional "images" blocks can be +included inside other blocks, normally "collections", "group" and +"part", easing mantienance of the file list when the theme is split +among multiple files. +@endblock + +@property +image +@parameters +[image file] [compression method] (compression level) +@effect +Used to include each image file. The full path to the directory holding +the images can be defined later with edje_cc's "-id" option. +Compression methods: +@li RAW: Uncompressed. +@li COMP: Lossless compression. +@li LOSSY [0-100]: Lossy comression with quality from 0 to 100. +@endproperty + */ static void st_images_image(void) { @@ -525,6 +597,32 @@ } } +/** +@page edcref + +@block +fonts +@context +fonts { +font: "filename1.ext" "fontname"; +font: "filename2.ext" "otherfontname"; +.. +} +@description +The "fonts" block is used to list each font file with an alias used later +in the theme. As with the "images" block, additional "fonts" blocks can +be included inside other blocks. +@endblock + +@property +font +@parameters +[font filename] [font alias] +@effect +Defines each font "file" and "alias", the full path to the directory +holding the font files can be defined with edje_cc's "-fd" option. +@endproperty + */ static void st_fonts_font(void) { @@ -566,6 +664,30 @@ } } +/** +@page edcref +@block +data +@context +data { +item: "arbitraryname" "arbitraryvalue"; +item: "othername" "othervalue"; +.. +} +@description +The "data" block is used to pass arbitrary parameters from the theme to +the application. Unlike the "images" and "fonts" blocks, additional +"data" blocks can only be included inside the "group" block. +@endblock + +@property +item +@parameters +[parameter name] [parameter value] +@effect +Defines each additional parameter. +@endproperty + */ static void st_data_item(void) { @@ -579,7 +701,27 @@ edje_file->data = evas_list_append(edje_file->data, di); } - +/** +@page edcref +@block +color_classes +@context +color_classes { +color_class { +name: "colorclassname"; +color: [0-255] [0-255] [0-255] [0-255]; +color2: [0-255] [0-255] [0-255] [0-255]; +color3: [0-255] [0-255] [0-255] [0-255] +} +.. +
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje Modified Files: Doxyfile Log Message: Edje reference patch one (from dresb) === RCS file: /cvs/e/e17/libs/edje/Doxyfile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Doxyfile22 Oct 2004 19:12:12 - 1.2 +++ Doxyfile23 Nov 2007 16:40:38 - 1.3 @@ -1,7 +1,7 @@ PROJECT_NAME = Edje PROJECT_NUMBER = OUTPUT_DIRECTORY = doc -INPUT = edje.c +INPUT = edje.c ./src/bin/edje_cc_handlers.c IMAGE_PATH = doc/img OUTPUT_LANGUAGE= English GENERATE_HTML = YES @@ -51,7 +51,14 @@ GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES -ALIASES= +ALIASES= block="" +ALIASES += context="\code" +ALIASES += description="\endcode " +ALIASES += endblock="" +ALIASES += property=" " +ALIASES += parameters="" +ALIASES += effect=" " +ALIASES += endproperty="" ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 OPTIMIZE_OUTPUT_FOR_C = YES - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/doc Modified Files: edje.css Log Message: Edje reference patch one (from dresb) === RCS file: /cvs/e/e17/libs/edje/doc/edje.css,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edje.css2 Jun 2003 23:49:54 - 1.1 +++ edje.css23 Nov 2007 16:40:38 - 1.2 @@ -176,3 +176,14 @@ text-align: center; font-size: 8; } +table.edcref { + border-collapse: collapse; +} +table.edcref td { + border-style: hidden; + vertical-align:top; + padding: 0.5em; +} +td.property { +width: 5em; +} - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_handlers.c Log Message: Edje reference patch one (from dresb) === RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -3 -r1.77 -r1.78 --- edje_cc_handlers.c 24 Jul 2007 14:20:07 - 1.77 +++ edje_cc_handlers.c 23 Nov 2007 16:40:38 - 1.78 @@ -1074,6 +1074,31 @@ } static void +st_collections_group_parts_part_effect(void) +{ + Edje_Part_Collection *pc; + Edje_Part *ep; + + check_arg_count(1); + + pc = evas_list_data(evas_list_last(edje_collections)); + ep = evas_list_data(evas_list_last(pc->parts)); + ep->effect = parse_enum(0, + "NONE", EDJE_TEXT_EFFECT_NONE, + "PLAIN", EDJE_TEXT_EFFECT_PLAIN, + "OUTLINE", EDJE_TEXT_EFFECT_OUTLINE, + "SOFT_OUTLINE", EDJE_TEXT_EFFECT_SOFT_OUTLINE, + "SHADOW", EDJE_TEXT_EFFECT_SHADOW, + "SOFT_SHADOW", EDJE_TEXT_EFFECT_SOFT_SHADOW, + "OUTLINE_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SHADOW, + "OUTLINE_SOFT_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW, + "FAR_SHADOW", EDJE_TEXT_EFFECT_FAR_SHADOW, + "FAR_SOFT_SHADOW", EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW, + "GLOW", EDJE_TEXT_EFFECT_GLOW, + NULL); +} + +static void st_collections_group_parts_part_dragable_x(void) { Edje_Part_Collection *pc; @@ -1505,6 +1530,79 @@ } static void +st_collections_group_parts_part_description_color_class(void) +{ + Edje_Part_Collection *pc; + Edje_Part *ep; + Edje_Part_Description *ed; + + check_arg_count(1); + + pc = evas_list_data(evas_list_last(edje_collections)); + ep = evas_list_data(evas_list_last(pc->parts)); + ed = ep->default_desc; + if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + ed->color_class = parse_str(0); +} + +static void +st_collections_group_parts_part_description_color(void) +{ + Edje_Part_Collection *pc; + Edje_Part *ep; + Edje_Part_Description *ed; + + check_arg_count(4); + + pc = evas_list_data(evas_list_last(edje_collections)); + ep = evas_list_data(evas_list_last(pc->parts)); + ed = ep->default_desc; + if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + ed->color.r = parse_int_range(0, 0, 255); + ed->color.g = parse_int_range(1, 0, 255); + ed->color.b = parse_int_range(2, 0, 255); + ed->color.a = parse_int_range(3, 0, 255); +} + +static void +st_collections_group_parts_part_description_color2(void) +{ + Edje_Part_Collection *pc; + Edje_Part *ep; + Edje_Part_Description *ed; + + check_arg_count(4); + + pc = evas_list_data(evas_list_last(edje_collections)); + ep = evas_list_data(evas_list_last(pc->parts)); + ed = ep->default_desc; + if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + ed->color2.r = parse_int_range(0, 0, 255); + ed->color2.g = parse_int_range(1, 0, 255); + ed->color2.b = parse_int_range(2, 0, 255); + ed->color2.a = parse_int_range(3, 0, 255); +} + +static void +st_collections_group_parts_part_description_color3(void) +{ + Edje_Part_Collection *pc; + Edje_Part *ep; + Edje_Part_Description *ed; + + check_arg_count(4); + + pc = evas_list_data(evas_list_last(edje_collections)); + ep = evas_list_data(evas_list_last(pc->parts)); + ed = ep->default_desc; + if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + ed->color3.r = parse_int_range(0, 0, 255); + ed->color3.g = parse_int_range(1, 0, 255); + ed->color3.b = parse_int_range(2, 0, 255); + ed->color3.a = parse_int_range(3, 0, 255); +} + +static void st_collections_group_parts_part_description_rel1_relative(void) { Edje_Part_Collection *pc; @@ -1850,72 +1948,72 @@ } static void -st_collections_group_parts_part_description_fill_origin_relative(void) +st_collections_group_parts_part_description_fill_spread(void) { Edje_Part_Collection *pc; Edje_Part *ep; Edje_Part_Description *ed; - check_arg_count(2); + check_arg_count(1); pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); - if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) + /* XXX this will need to include IMAGES when spread support is added to evas images */ + if (ep->type != EDJE_PART_TYPE_GRADIENT) { fprintf(stderr, "%s: Error. parse error %s:%i. " - "fill attributes in non-IMAGE part.\n", + "gradient attributes in non-GRADIENT part.\n", progname, file_in, line - 1); exit(-1); } ed = ep->default_desc; if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); - ed->fill.pos_rel_x = p
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Always hide on mouse out === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -3 -r1.81 -r1.82 --- e_shelf.c 23 Nov 2007 12:02:21 - 1.81 +++ e_shelf.c 23 Nov 2007 12:03:00 - 1.82 @@ -1285,7 +1285,7 @@ ev = event; es = data; if (ev->win != es->win) return 1; - if (!es->cfg->autohide_show_action) e_shelf_toggle(es, 0); + e_shelf_toggle(es, 0); return 1; } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Only hide if config says so. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -3 -r1.80 -r1.81 --- e_shelf.c 23 Nov 2007 09:23:52 - 1.80 +++ e_shelf.c 23 Nov 2007 12:02:21 - 1.81 @@ -1285,7 +1285,7 @@ ev = event; es = data; if (ev->win != es->win) return 1; - e_shelf_toggle(es, 0); + if (!es->cfg->autohide_show_action) e_shelf_toggle(es, 0); return 1; } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c Log Message: Only call shelf_lock_set if the gadcon is part of a shelf & gadcon->shelf exists. . This fixes segfaults with trying to edit/move items in the toolbar. === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- e_gadcon.c 23 Nov 2007 09:38:30 - 1.90 +++ e_gadcon.c 23 Nov 2007 11:49:27 - 1.91 @@ -540,7 +540,7 @@ E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); e_gadcon_layout_freeze(gc->o_container); - e_shelf_locked_set(gc->shelf, 1); + if (gc->shelf) e_shelf_locked_set(gc->shelf, 1); gc->editing = 1; for (l = gc->clients; l; l = l->next) { @@ -569,7 +569,7 @@ e_gadcon_client_edit_end(gcc); } e_gadcon_layout_thaw(gc->o_container); - e_shelf_locked_set(gc->shelf, 0); + if (gc->shelf) e_shelf_locked_set(gc->shelf, 0); } EAPI void @@ -823,7 +823,7 @@ if (gcc->o_control) return; - e_shelf_locked_set(gcc->gadcon->shelf, 1); + if (gcc->gadcon->shelf) e_shelf_locked_set(gcc->gadcon->shelf, 1); gcc->gadcon->editing = 1; gcc->o_control = edje_object_add(gcc->gadcon->evas); evas_object_layer_set(gcc->o_control, 100); @@ -945,7 +945,7 @@ if (client->o_control) return; } gcc->gadcon->editing = 0; - e_shelf_locked_set(gcc->gadcon->shelf, 0); + if (gcc->gadcon->shelf) e_shelf_locked_set(gcc->gadcon->shelf, 0); } EAPI void - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : libs/ecore Dir : e17/libs/ecore/debian Modified Files: control Added Files: libecore0-imf-evas.install Log Message: add imf-evas to debian packages. === RCS file: /cvs/e/e17/libs/ecore/debian/control,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- control 21 Nov 2007 15:28:33 - 1.40 +++ control 23 Nov 2007 11:09:37 - 1.41 @@ -108,6 +108,20 @@ applications. This package contains the Ecore Input Method Framework module. +Package: libecore0-imf-evas +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}) +Provides: libecore-imf-evas +Description: Evas helpers for the Ecore Input Method Framework + This is the core event abstraction layer and X abstraction layer that makes + doing selections, Xdnd, general X stuff, and event loops, timeouts and idle + handlers fast, optimized, and convenient. It's a separate library so anyone + can make use of the work put into Ecore to make this job easy for + applications. + This package contains the Evas helper functions for the Ecore Input Method + Framework module. + Package: libecore0-ipc Architecture: any Section: libs @@ -165,7 +179,7 @@ Architecture: any Section: libdevel Architecture: any -Depends: libecore0 (= ${Source-Version}), libecore-config, libecore-con, libecore-desktop, libecore-evas, libecore-fb, libecore-file, libecore-imf, libecore-ipc, libecore-job, libecore-txt, libecore-x +Depends: libecore0 (= ${Source-Version}), libecore-config, libecore-con, libecore-desktop, libecore-evas, libecore-fb, libecore-file, libecore-imf, libecore-imf-evas, libecore-ipc, libecore-job, libecore-txt, libecore-x Provides: libecore-all Description: Virtual package providing all available Ecore modules. This is the core event abstraction layer and X abstraction layer that makes - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: photo englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : photo Dir : e_modules/photo/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/photo/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: emu englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : emu Dir : e_modules/emu/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/emu/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:47 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: efm_nav englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : efm_nav Dir : e_modules/efm_nav/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/efm_nav/po/Makevars,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makevars20 Nov 2007 06:48:54 - 1.1 +++ Makevars23 Nov 2007 10:06:47 - 1.2 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: taskbar englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : taskbar Dir : e_modules/taskbar/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/taskbar/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: forecasts englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/forecasts/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: alarm englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : alarm Dir : e_modules/alarm/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/alarm/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:47 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: flame englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : flame Dir : e_modules/flame/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/flame/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: screenshot englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : screenshot Dir : e_modules/screenshot/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/screenshot/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: penguins englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : penguins Dir : e_modules/penguins/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/penguins/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:08:53 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mail englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : mail Dir : e_modules/mail/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/mail/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: snow englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : snow Dir : e_modules/snow/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/snow/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: slideshow englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : slideshow Dir : e_modules/slideshow/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/slideshow/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: net englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : net Dir : e_modules/net/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/net/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_intl Modified Files: e_int_config_intl.c Log Message: Translate === RCS file: /cvs/e/e17/apps/e/src/modules/conf_intl/e_int_config_intl.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_intl.c 15 Nov 2007 20:50:23 - 1.6 +++ e_int_config_intl.c 23 Nov 2007 10:11:53 - 1.7 @@ -116,7 +116,7 @@ {"it_IT.UTF-8", "Italiano"}, {"ja_JP.UTF-8", "æ¥æ¬èª"}, {"ko_KR.UTF-8", "íêµì´"}, - {"nb_NO.UTF-8", "Norsk"}, + {"nb_NO.UTF-8", "Norsk BokmÃ¥l"}, {"pl_PL.UTF-8", "Polski"}, {"pt_BR.UTF-8", "Português"}, {"ru_RU.UTF-8", "Ð ÑÑÑкий"}, @@ -208,11 +208,11 @@ {"mr", "मराठà¥"}, {"ms", "Bahasa Melayu"}, {"mt", "Malti"}, - {"nb", "Norsk"}, + {"nb", "Norsk BokmÃ¥l"}, {"ne", "नà¥à¤ªà¤¾à¤²à¥"}, {"nl", "Nederlands"}, - {"nn", "Norwegian Nynorsk"}, - {"no", "Norwegian"}, + {"nn", "Norsk Nynorsk"}, + {"no", "Norsk"}, {"nr", "isiNdebele"}, {"nso", "Sesotho sa Leboa"}, {"ny", "Chicheŵa"}, @@ -430,7 +430,7 @@ { "NU", "Niue"}, { "NF", "Norfolk Island"}, { "MP", "Northern Mariana Islands"}, - { "NO", "Norway"}, + { "NO", "Norge"}, { "OM", "Oman"}, { "PK", "Pakistan"}, { "PW", "Palau"}, - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/weather/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:28 - 1.2 +++ Makevars23 Nov 2007 10:06:50 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: uptime englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : uptime Dir : e_modules/uptime/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/uptime/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:28 - 1.2 +++ Makevars23 Nov 2007 10:06:50 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tclock englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : tclock Dir : e_modules/tclock/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/tclock/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:28 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: moon englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : moon Dir : e_modules/moon/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/moon/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: news englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : news Dir : e_modules/news/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/news/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: rain englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : rain Dir : e_modules/rain/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/rain/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:27 - 1.2 +++ Makevars23 Nov 2007 10:06:49 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : mem Dir : e_modules/mem/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/mem/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mixer englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : mixer Dir : e_modules/mixer/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/mixer/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: cpu englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : cpu Dir : e_modules/cpu/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/cpu/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:47 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : language Dir : e_modules/language/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/language/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:26 - 1.2 +++ Makevars23 Nov 2007 10:06:48 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: calendar englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : calendar Dir : e_modules/calendar/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/calendar/po/Makevars,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makevars20 Nov 2007 11:19:51 - 1.1 +++ Makevars23 Nov 2007 10:06:47 - 1.2 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: efm_path englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : efm_path Dir : e_modules/efm_path/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/efm_path/po/Makevars,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makevars20 Nov 2007 06:39:35 - 1.1 +++ Makevars23 Nov 2007 10:06:47 - 1.2 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: wlan englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : wlan Dir : e_modules/wlan/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/wlan/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:28 - 1.2 +++ Makevars23 Nov 2007 10:06:50 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c Log Message: lock shelf on gadcon edit and menu === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- e_gadcon.c 23 Nov 2007 09:32:02 - 1.89 +++ e_gadcon.c 23 Nov 2007 09:38:30 - 1.90 @@ -540,6 +540,7 @@ E_OBJECT_CHECK(gc); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); e_gadcon_layout_freeze(gc->o_container); + e_shelf_locked_set(gc->shelf, 1); gc->editing = 1; for (l = gc->clients; l; l = l->next) { @@ -568,6 +569,7 @@ e_gadcon_client_edit_end(gcc); } e_gadcon_layout_thaw(gc->o_container); + e_shelf_locked_set(gc->shelf, 0); } EAPI void @@ -821,6 +823,7 @@ if (gcc->o_control) return; + e_shelf_locked_set(gcc->gadcon->shelf, 1); gcc->gadcon->editing = 1; gcc->o_control = edje_object_add(gcc->gadcon->evas); evas_object_layer_set(gcc->o_control, 100); @@ -942,6 +945,7 @@ if (client->o_control) return; } gcc->gadcon->editing = 0; + e_shelf_locked_set(gcc->gadcon->shelf, 0); } EAPI void @@ -1155,6 +1159,9 @@ E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); + e_shelf_locked_set(gcc->gadcon->shelf, 1); + e_menu_post_deactivate_callback_set(menu, _e_gadcon_client_cb_menu_post, gcc); + if (!gcc->gadcon->toolbar) { mn = e_menu_new(); @@ -1584,8 +1591,9 @@ E_Menu_Item *mi; int cx, cy; - zone = e_util_zone_current_get(e_manager_current_get()), + zone = e_util_zone_current_get(e_manager_current_get()); + e_shelf_locked_set(gcc->gadcon->shelf, 1); mn = e_menu_new(); e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post, gcc); @@ -2157,6 +2165,7 @@ E_Gadcon_Client *gcc; gcc = data; + e_shelf_locked_set(gcc->gadcon->shelf, 0); if (!gcc->menu) return; e_object_del(E_OBJECT(gcc->menu)); gcc->menu = NULL; @@ -2177,6 +2186,7 @@ E_Menu *mn; int cx, cy, cw, ch; + e_shelf_locked_set(gcc->gadcon->shelf, 1); mn = e_menu_new(); e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post, gcc); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c Log Message: Declare and put static methods where they belong. === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -3 -r1.88 -r1.89 --- e_gadcon.c 16 Nov 2007 03:07:54 - 1.88 +++ e_gadcon.c 23 Nov 2007 09:32:02 - 1.89 @@ -44,6 +44,16 @@ static void _e_gadcon_cb_dnd_leave(void *data, const char *type, void *event); static void _e_gadcon_cb_drop(void *data, const char *type, void *event); +static int _e_gadcon_client_class_feature_check(E_Gadcon_Client_Class *cc, const char *name, void *feature); +static void _e_gadcon_client_cb_menu_post(void *data, E_Menu *m); +static void _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_gadcon_client_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_gadcon_client_cb_menu_remove(void *data, E_Menu *m, E_Menu_Item *mi); + static Evas_Object *e_gadcon_layout_add(Evas *evas); static void e_gadcon_layout_orientation_set(Evas_Object *obj, int horizontal); static int e_gadcon_layout_orientation_get(Evas_Object *obj); @@ -60,8 +70,6 @@ static void e_gadcon_layout_pack_aspect_pad_set(Evas_Object *obj, int w, int h); static void e_gadcon_layout_unpack(Evas_Object *obj); -static int _e_gadcon_client_class_feature_check(E_Gadcon_Client_Class *cc, const char *name, void *feature); - // #define E_LAYOUT_ITEM_DRAG_RESIST_LEVEL 10 @@ -1138,91 +1146,6 @@ return 1; } -static void -_e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi) -{ - E_Gadcon_Client *gcc; - E_Gadcon *gc; - - gcc = data; - gc = gcc->gadcon; - if (gcc->style) evas_stringshare_del(gcc->style); - gcc->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_PLAIN); - _e_gadcon_client_save(gcc); - e_gadcon_unpopulate(gc); - e_gadcon_populate(gc); -} - -static void -_e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi) -{ - E_Gadcon_Client *gcc; - E_Gadcon *gc; - - gcc = data; - gc = gcc->gadcon; - if (gcc->style) evas_stringshare_del(gcc->style); - gcc->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_INSET); - _e_gadcon_client_save(gcc); - e_gadcon_unpopulate(gc); - e_gadcon_populate(gc); -} - -static void -_e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m, E_Menu_Item *mi) -{ - E_Gadcon_Client *gcc; - - gcc = data; - e_gadcon_layout_freeze(gcc->gadcon->o_container); - if (gcc->autoscroll) gcc->autoscroll = 0; - else gcc->autoscroll = 1; - e_gadcon_client_autoscroll_set(gcc, gcc->autoscroll); - _e_gadcon_client_save(gcc); - e_gadcon_layout_thaw(gcc->gadcon->o_container); -} - -static void -_e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Item *mi) -{ - E_Gadcon_Client *gcc; - - gcc = data; - e_gadcon_layout_freeze(gcc->gadcon->o_container); - if (gcc->resizable) gcc->resizable = 0; - else gcc->resizable = 1; - e_gadcon_client_resizable_set(gcc, gcc->resizable); - _e_gadcon_client_save(gcc); - e_gadcon_layout_thaw(gcc->gadcon->o_container); -} - -static void -_e_gadcon_client_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) -{ - E_Gadcon_Client *gcc; - - gcc = data; - if (gcc->o_control) - e_gadcon_client_edit_end(gcc); - else - e_gadcon_client_edit_begin(gcc); -} - -static void -_e_gadcon_client_cb_menu_remove(void *data, E_Menu *m, E_Menu_Item *mi) -{ - E_Gadcon *gc; - E_Gadcon_Client *gcc; - - gcc = data; - gc = gcc->gadcon; - - e_gadcon_client_config_del(gc->cf, gcc->cf); - e_gadcon_unpopulate(gc); - e_gadcon_populate(gc); - e_config_save_queue(); -} - EAPI void e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int flags) { @@ -1297,49 +1220,6 @@ gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, menu); } } - -static void -_e_gadcon_client_cb_menu_post(void *data, E_Menu *m) -{ - E_Gadcon_Client *gcc; - - gcc = data; - if (!gcc->menu) return; - e_object_del(E_OBJECT(gcc->menu)); - gcc->menu = NULL; -} - -static void -_e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - Evas_Event_Mouse_Down *ev; - E_Gadcon_Client *gcc; - - ev = event_info; - gcc = data; - - if (gcc->menu) return; - if (ev->button == 3) - { - E_Menu *mn; - int cx, cy,
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Fix if statement. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- e_shelf.c 23 Nov 2007 09:22:43 - 1.79 +++ e_shelf.c 23 Nov 2007 09:23:52 - 1.80 @@ -272,8 +272,8 @@ E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE); es->toggle = show; - if (es->locked) - es->interrupted = -1; + if (es->locked) return; + es->interrupted = -1; if ((show) && (es->hidden)) { es->hidden = 0; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: Remove debug printf === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- e_shelf.c 23 Nov 2007 09:18:21 - 1.78 +++ e_shelf.c 23 Nov 2007 09:22:43 - 1.79 @@ -253,7 +253,6 @@ EAPI void e_shelf_locked_set(E_Shelf *es, int lock) { - printf("Lock shelf: %d\n", lock); if (lock) { e_shelf_toggle(es, 1); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.h e_shelf.c Log Message: Possible to lock shelf. === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_shelf.h 22 Nov 2007 21:39:45 - 1.26 +++ e_shelf.h 23 Nov 2007 09:18:21 - 1.27 @@ -28,9 +28,6 @@ const char *name; const char *style; E_Config_Shelf *cfg; - unsigned charfit_along : 1; - unsigned charfit_size : 1; - unsigned charhidden: 1; int size; E_Config_Dialog *config_dialog; E_Menu *menu; @@ -43,6 +40,11 @@ floatinstant_delay; Ecore_Timer *instant_timer; Evas_List *handlers; + unsigned charfit_along : 1; + unsigned charfit_size : 1; + unsigned charhidden: 1; + unsigned charlocked: 1; + unsigned chartoggle: 1; }; EAPI int e_shelf_init(void); @@ -54,6 +56,7 @@ EAPI void e_shelf_populate(E_Shelf *es); EAPI void e_shelf_show(E_Shelf *es); EAPI void e_shelf_hide(E_Shelf *es); +EAPI void e_shelf_locked_set(E_Shelf *es, int lock); EAPI void e_shelf_toggle(E_Shelf *es, int show); EAPI void e_shelf_move(E_Shelf *es, int x, int y); EAPI void e_shelf_resize(E_Shelf *es, int w, int h); === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -3 -r1.77 -r1.78 --- e_shelf.c 23 Nov 2007 06:38:08 - 1.77 +++ e_shelf.c 23 Nov 2007 09:18:21 - 1.78 @@ -251,52 +251,68 @@ } EAPI void +e_shelf_locked_set(E_Shelf *es, int lock) +{ + printf("Lock shelf: %d\n", lock); + if (lock) + { + e_shelf_toggle(es, 1); + es->locked = 1; + } + else + { + es->locked = 0; + e_shelf_toggle(es, es->toggle); + } +} + +EAPI void e_shelf_toggle(E_Shelf *es, int show) { - E_OBJECT_CHECK(es); - E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE); + E_OBJECT_CHECK(es); + E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE); - es->interrupted = -1; - if ((show) && (es->hidden)) -{ - es->hidden = 0; - edje_object_signal_emit(es->o_base, "e,state,visible", "e"); - if (es->instant_delay >= 0.0) -{ - _e_shelf_cb_instant_hide_timer(es); -} - else -{ - if (es->hide_timer) - { -ecore_timer_del(es->hide_timer); -es->hide_timer = NULL; - } - if (!es->hide_animator) - es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es); -} -} - else if ((!show) && (!es->hidden) && (!es->gadcon->editing) && (es->cfg->autohide)) -{ - edje_object_signal_emit(es->o_base, "e,state,hidden", "e"); - if (es->instant_delay >= 0.0) -{ - es->hidden = 1; - if (!es->instant_timer) - es->instant_timer = ecore_timer_add(es->instant_delay, _e_shelf_cb_instant_hide_timer, es); -} - else -{ - if (es->hide_animator) - { -es->interrupted = show; -return; - } - es->hidden = 1; - if (es->hide_timer) ecore_timer_del(es->hide_timer); - es->hide_timer = ecore_timer_add(es->cfg->hide_timeout, _e_shelf_cb_hide_animator_timer, es); -} -} + es->toggle = show; + if (es->locked) + es->interrupted = -1; + if ((show) && (es->hidden)) + { + es->hidden = 0; + edje_object_signal_emit(es->o_base, "e,state,visible", "e"); + if (es->instant_delay >= 0.0) + _e_shelf_cb_instant_hide_timer(es); + else + { +if (es->hide_timer) + { + ecore_timer_del(es->hide_timer); + es->hide_timer = NULL; + } +if (!es->hide_animator) + es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es); + } + } + else if ((!show) && (!es->hidden) && (!es->gadcon->editing) && (es->cfg->autohide)) + { + edje_object_signal_emit(es->o_base, "e,state,hidden", "e"); + if (es->instant_delay >= 0.0) + { +es->hidden = 1; +if (!es->instant_timer) + es->instant_timer = ecore_timer_add(es->instant_delay, _e_shelf_cb_instant_hide_timer, es); + } + else + { +if (es->hide_animator) + { + es->interrupted = show; + return; + } +es->hidden = 1; +