Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment.c exhibit_main.c
Log Message:
- replace 1 line entry with multiline textview. w00t
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- exhibit.h 29 Jul 2006 02:49:24 -0000 1.18
+++ exhibit.h 29 Jul 2006 15:18:13 -0000 1.19
@@ -97,7 +97,7 @@
Etk_Widget *vbox;
Etk_Widget *frame;
Etk_Widget *table;
- Etk_Widget *entry;
+ Etk_Widget *textview;
Etk_Widget *save;
Etk_Widget *revert;
Etk_Widget *vbox2;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- exhibit_comment.c 29 Jul 2006 02:49:24 -0000 1.6
+++ exhibit_comment.c 29 Jul 2006 15:18:13 -0000 1.7
@@ -29,7 +29,8 @@
e->cur_tab->comment.frame = etk_frame_new(_("Image Comments"));
etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
- e->cur_tab->comment.entry = etk_entry_new();
+ e->cur_tab->comment.textview = etk_text_view_new();
+ etk_widget_size_request_set(e->cur_tab->comment.textview, -1, 50);
e->cur_tab->comment.save = etk_button_new_with_label("Save");
etk_signal_connect("clicked", ETK_OBJECT(e->cur_tab->comment.save),
ETK_CALLBACK(_ex_comment_save_clicked_cb), e);
e->cur_tab->comment.revert = etk_button_new_with_label("Revert");
@@ -40,7 +41,7 @@
etk_container_add(ETK_CONTAINER(e->cur_tab->comment.frame),
e->cur_tab->comment.vbox2);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox2),
e->cur_tab->comment.entry, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox2),
e->cur_tab->comment.textview, ETK_TRUE, ETK_TRUE, 0);
etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox2),
e->cur_tab->comment.hbox, ETK_FALSE, ETK_FALSE, 0);
etk_box_pack_start(ETK_BOX(e->cur_tab->comment.hbox),
e->cur_tab->comment.revert, ETK_FALSE, ETK_FALSE, 0);
@@ -48,7 +49,8 @@
e->cur_tab->comment.visible = ETK_TRUE;
- etk_widget_show_all(ETK_WIDGET(e->hpaned));
+ etk_widget_show_all(ETK_WIDGET(e->hpaned));
+ _ex_comment_load(e);
}
void
@@ -74,7 +76,7 @@
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
}
- etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.entry));
+ etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.textview));
etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.save));
etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.revert));
etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.hbox));
@@ -96,10 +98,10 @@
if (_ex_file_is_jpg(file))
if (_ex_comment_jpeg_read(file, &comment, &len) && (len != 0))
{
- etk_entry_text_set(ETK_ENTRY(e->cur_tab->comment.entry), comment);
+
etk_textblock_text_set(ETK_TEXT_VIEW(e->cur_tab->comment.textview)->textblock,
+ comment, ETK_TRUE);
return;
}
- etk_entry_text_set(ETK_ENTRY(e->cur_tab->comment.entry), "");
}
void
@@ -110,7 +112,7 @@
int len;
file = ((Ex_Tab *) e->cur_tab)->cur_file;
- comment = etk_entry_text_get(ETK_ENTRY(e->cur_tab->comment.entry));
+ comment =
etk_string_get(etk_textblock_text_get(ETK_TEXT_VIEW(e->cur_tab->comment.textview)->textblock,
ETK_FALSE));
if (comment)
len = strlen(comment);
else
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- exhibit_main.c 29 Jul 2006 02:49:24 -0000 1.51
+++ exhibit_main.c 29 Jul 2006 15:18:13 -0000 1.52
@@ -283,8 +283,6 @@
etk_range_value_set(hs, (double)w/2);
etk_range_value_set(vs, (double)h/2);
-
- _ex_comment_load(e);
}
void
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
