Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_dialog.c e_error.c e_test.c Log Message: edje +tb2 now usinged in e17 =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_dialog.c 5 Sep 2005 15:24:07 -0000 1.4 +++ e_dialog.c 18 Sep 2005 06:27:47 -0000 1.5 @@ -56,36 +56,12 @@ evas_object_move(o, 0, 0); evas_object_show(o); - o = evas_object_textblock_add(e_win_evas_get(dia->win)); + o = edje_object_add(e_win_evas_get(dia->win)); dia->text_object = o; + e_theme_edje_object_set(o, "base/theme/dialog", + "widgets/dialog/text"); edje_object_part_swallow(dia->bg_object, "content_swallow", o); evas_object_show(o); - { - char format[1024]; - char *fname; - int fsize; - - fname = (char *)e_font_default_string_get("default", &fsize); - snprintf(format, sizeof(format), - "font='%s' size=%i wrap=word", - fname, fsize); - evas_object_textblock_format_insert(o, format); - evas_object_textblock_format_insert(o, "color=#000"); -#if 0 - evas_object_textblock_format_insert(o, "\n"); - evas_object_textblock_text_insert(o, "Here is some text"); - evas_object_textblock_format_insert(o, "\n"); - evas_object_textblock_text_insert(o, "Here is some more text"); - evas_object_textblock_format_insert(o, "\n"); - evas_object_textblock_text_insert(o, "And even more text on this line to make it really long for testing"); - evas_object_textblock_format_insert(o, "\n"); - evas_object_textblock_text_insert(o, "Short"); - evas_object_textblock_format_insert(o, "\n"); - evas_object_textblock_text_insert(o, "Aaardvaaarks On!"); - evas_object_textblock_format_insert(o, "\n"); - evas_object_textblock_format_insert(o, "\n"); -#endif - } o = e_box_add(e_win_evas_get(dia->win)); dia->box_object = o; @@ -139,7 +115,7 @@ void e_dialog_text_set(E_Dialog *dia, char *text) { - evas_object_textblock_text_insert(dia->text_object, text); + edje_object_part_text_set(dia->text_object, "text", text); } void @@ -154,9 +130,8 @@ Evas_Object *o; o = dia->text_object; -// evas_object_textblock_format_size_get(o, &mw, &mh); - evas_object_textblock_native_size_get(o, &mw, &mh); - edje_extern_object_min_size_set(o, mw + 2, mh + 2); + edje_object_size_min_calc(o, &mw, &mh); + edje_extern_object_min_size_set(o, mw, mh); edje_object_part_swallow(dia->bg_object, "content_swallow", o); o = dia->box_object; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_error.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_error.c 5 Sep 2005 15:24:07 -0000 1.26 +++ e_error.c 18 Sep 2005 06:27:47 -0000 1.27 @@ -268,9 +268,9 @@ else { char format[1024]; - Evas_Object *text; - int x, y, w, h, nw, nh; - char *fname; + int x, y, w, h; + Evas_Coord ow, oh; + char *fname, *newstr; int fsize; evas_object_move(o, 0, 0); @@ -280,41 +280,45 @@ evas_object_show(o); edje_object_part_text_set(o, "title", title); - - fname = (char *)e_font_default_string_get("default", &fsize); - snprintf(format, sizeof(format), - "font='%s' size=%i wrap=word", - fname, fsize); - text = evas_object_textblock_add(e); - evas_object_color_set(text, 0, 0, 0, 255); - evas_object_textblock_format_insert(text, format); + { - char *pp, *newstr, *p; + char *pp, *newstr, *p, *markup = NULL; + newstr = strdup(txt); p = newstr; while (p) { pp = strchr(p, '\n'); if (pp) *pp = 0; - evas_object_textblock_text_insert(text, p); + if (markup) + { + markup = realloc(markup, strlen(markup) + strlen(p) + 1); + strcat(markup, p); + } + else + markup = strdup(p); if (pp) { p = pp + 1; - evas_object_textblock_format_insert(text, "\n"); + if (markup) + { + markup = realloc(markup, strlen(markup) + strlen("<br>") + 1); + strcat(markup, "<br>"); + } + else + markup = strdup("<br>"); } else p = NULL; } + edje_object_part_text_set(o, "text", markup); + free(markup); free(newstr); } - edje_object_part_swallow(o, "text", text); - evas_object_show(text); - - edje_object_part_geometry_get(o, "text", &x, &y, &w, &h); - evas_object_textblock_format_size_get(text, &nw, &nh); - /* FIXME: How to handle the width of the text? */ - error_h += (nh - h); - + edje_object_size_min_calc(o, &ow, &oh); + error_w = ow; + error_h = oh; + evas_object_move(o, 0, 0); evas_object_resize(o, error_w, error_h); evas_object_show(o); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_test.c 14 Aug 2005 17:09:45 -0000 1.12 +++ e_test.c 18 Sep 2005 06:27:47 -0000 1.13 @@ -281,7 +281,7 @@ ecore_timer_add(0.02, _e_test_timer, m); } } -#elif 0 +#elif 1 static void _e_test_dialog_del(void *obj) { @@ -299,6 +299,7 @@ dia = e_dialog_new(con); e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del); e_dialog_title_set(dia, "A Test Dialog"); + e_dialog_text_set(dia, "A Test Dialog<br>And another line<br><hilight>Hilighted Text</hilight>"); e_dialog_button_add(dia, "OK", NULL, NULL, NULL); e_dialog_button_add(dia, "Apply", NULL, NULL, NULL); e_dialog_button_add(dia, "Cancel", NULL, NULL, NULL); ------------------------------------------------------- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42" plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs