E CVS: proto moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e17
Module  : proto

Dir     : e17/proto/etk/src/bin


Modified Files:
        etk_menu_test.c etk_text_view_test.c 


Log Message:
* [Etk_String] etk_string_insert/append/prepend/set(string, "text") now creates 
a new string if 'string' is NULL
* [Etk_Textblock] More work


===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_menu_test.c     28 Mar 2006 07:24:57 -0000      1.10
+++ etk_menu_test.c     17 Jun 2006 12:02:40 -0000      1.11
@@ -43,7 +43,7 @@
    menu_bar = etk_menu_bar_new();
    etk_box_pack_start(ETK_BOX(vbox), menu_bar, ETK_FALSE, ETK_FALSE, 0);
    
-   label = etk_label_new(_("Click me :)"));
+   label = etk_label_new("<b>Bold</b><br>New Line<b>Test</b>");
    etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
    etk_widget_pass_mouse_events_set(label, ETK_TRUE);
    etk_box_pack_start(ETK_BOX(vbox), label, ETK_TRUE, ETK_TRUE, 0);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_text_view_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_text_view_test.c        2 Jun 2006 18:46:34 -0000       1.3
+++ etk_text_view_test.c        17 Jun 2006 12:02:40 -0000      1.4
@@ -22,35 +22,35 @@
    etk_container_add(ETK_CONTAINER(win), vbox);
 
    text_view = etk_text_view_new();
-   /* TODO: */
    /*etk_textblock_text_set(ETK_TEXT_VIEW(text_view)->textblock,
-      "<center><h1>Title</h1></center><br>"
-      "<p><tab>A pragraph here <red>red text</red> and stuff.</p>"
-      "<p>And escaping &lt; and &gt; as well as &amp; as <h1>normal.</h1></p>"
-      "<p>If you want a newline use &lt;br&gt;<br>woo a new line!</p>"
-      "<right>Right "
-      "<style=outline color=#fff outline_color=#000>aligned</> "
-      "<style=shadow shadow_color=#fff8>text</> "
-      "<style=soft_shadow shadow_color=#0002>should</> "
-      "<style=glow color=#fff glow2_color=#fe87 glow_color=#f214 >go here</> "
-      "<style=far_shadow shadow_color=#0005>as it is</> "
-      "<style=outline_shadow color=#fff outline_color=#8228 
shadow_color=#005>within</> "
-      "<style=outline_soft_shadow color=#fff outline_color=#8228 
shadow_color=#0002>right tags</> "
-      "<style=far_soft_shadow color=#fff shadow_color=#0002>to make it align 
to the</> "
-      "<underline=on underline_color=#00f>right hand</> "
-      "<backing=on backing_color=#fff8>side 
</><backing_color=#ff08>of</><backing_color=#0f08> </>"
-      "<strikethrough=on strikethrough_color=#f0f8>the textblock</>.</right>"
-      "<p>And "
-      "<underline=double underline_color=#f00 underline2_color=#00f>now we 
need</> "
-      "to test some <color=#f00 font_size=8>C</><color=#0f0 font_size=10>O</>"
-      "<color=#00f font_size=12>L</><color=#fff font_size=14>O</>"
-      "<color=#ff0 font_size=16>R</><color=#0ff font_size=18> Bla Rai</>"
-      "<color=#f0f font_size=20> Stuff</>.</p>"
-      "<blockquote>"
+      "Test <b>Bold <i>Bold Italic </b>Italic </i>Test",
+      ETK_TRUE);*/
+   etk_textblock_text_set(ETK_TEXT_VIEW(text_view)->textblock,
+      "<p align=\"center\">Title</p>"
+      "A paragraph here <font color=#f00>red <b>text</b></font> and stuff."
+      "And escaping &lt; and &gt; as well as &amp; as <b>normal.</b>"
+      "If you want a newline use &lt;br&gt;\nwoo a new line!"
+      "<p align=\"right\">Right</p>"
+      "<style effect=\"outline\" color1=#fff color2=#000>aligned</style> "
+      "<style effect=\"shadow\" color1=#fff8>text</style> "
+      "<style effect=\"soft_shadow\" color1=#0002>should</style> "
+      "<style effect=\"glow\" color1=#fe87 color2=#f214 >go here</style> "
+      "<u>right hand</u> "
+      "And "
+      "<u type=\"double\">now we need</u> "
+      "to test some <font color=#f00 size=8>COLOR</font>\n"
+      "(日本語 カタカナ ひらがな) "
       "Heizölrückstoßabdämpfung fløde pingüino kilómetros cœur déçu 
l'âme "
-      "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava 
Ádhaim"
-      "</blockquote>"
-   );*/
+      "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava 
Ádhaim",
+      ETK_TRUE);
+   
+   
+   /*etk_textblock_printf(ETK_TEXT_VIEW(text_view)->textblock);*/
+   printf("\n");
+   printf("%s\n", 
etk_string_get(etk_textblock_text_get(ETK_TEXT_VIEW(text_view)->textblock, 
ETK_TRUE)));
+   /*printf("\n");
+   printf("%s\n", 
etk_string_get(etk_textblock_text_get(ETK_TEXT_VIEW(text_view)->textblock, 
ETK_FALSE)));*/
+   
    etk_box_pack_start(ETK_BOX(vbox), text_view, ETK_TRUE, ETK_TRUE, 0);
    
    etk_widget_show_all(win);





_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs