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 exhibit_menus.c
exhibit_tab.c
Log Message:
- the comments box should play nice now. if any more bugs are found, please do
say.
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- exhibit.h 28 Jul 2006 16:04:47 -0000 1.17
+++ exhibit.h 29 Jul 2006 02:49:24 -0000 1.18
@@ -64,7 +64,9 @@
int comments_visible;
- Ex_Images im_view;
+ int im_view;
+
+ int default_sort;
};
struct _Ex_Tab
@@ -89,6 +91,19 @@
Etk_Tree_Col *icol;
Exhibit *e;
+
+ struct {
+ Etk_Bool visible;
+ Etk_Widget *vbox;
+ Etk_Widget *frame;
+ Etk_Widget *table;
+ Etk_Widget *entry;
+ Etk_Widget *save;
+ Etk_Widget *revert;
+ Etk_Widget *vbox2;
+ Etk_Widget *hbox;
+ char *text;
+ } comment;
};
@@ -113,19 +128,6 @@
Etk_Widget *zoombar;
Etk_Widget *menu;
Etk_Widget *win;
-
- struct {
- Etk_Bool visible;
- Etk_Widget *vbox;
- Etk_Widget *frame;
- Etk_Widget *table;
- Etk_Widget *entry;
- Etk_Widget *save;
- Etk_Widget *revert;
- Etk_Widget *vbox2;
- Etk_Widget *hbox;
- char *text;
- } comment;
char fav_path[PATH_MAX];
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- exhibit_comment.c 28 Jul 2006 16:04:47 -0000 1.5
+++ exhibit_comment.c 29 Jul 2006 02:49:24 -0000 1.6
@@ -6,35 +6,47 @@
void
_ex_comment_show(Exhibit *e)
{
- if(e->comment.visible)
+ if(e->cur_tab->comment.visible)
return;
- e->comment.vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_paned_child2_set(ETK_PANED(e->hpaned), e->comment.vbox, ETK_TRUE);
-
- etk_box_pack_start(ETK_BOX(e->comment.vbox), e->cur_tab->scrolled_view,
ETK_TRUE, ETK_TRUE, 0);
+ e->cur_tab->comment.vbox = etk_vbox_new(ETK_FALSE, 0);
+ if(evas_list_count(e->tabs) == 1)
+ {
+ /* we only have 1 tab, ie, no notebook */
+ etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->comment.vbox,
ETK_TRUE);
+ }
+ else
+ {
+ /* we have multiple tabs */
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook), e->cur_tab->num,
e->cur_tab->comment.vbox);
+ }
+
+ if (e->cur_tab->fit_window)
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->alignment, ETK_TRUE, ETK_TRUE, 0);
+ else
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
- e->comment.frame = etk_frame_new(_("Image Comments"));
- etk_box_pack_start(ETK_BOX(e->comment.vbox), e->comment.frame, ETK_FALSE,
ETK_FALSE, 3);
+ 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->comment.entry = etk_entry_new();
- e->comment.save = etk_button_new_with_label("Save");
- etk_signal_connect("clicked", ETK_OBJECT(e->comment.save),
ETK_CALLBACK(_ex_comment_save_clicked_cb), e);
- e->comment.revert = etk_button_new_with_label("Revert");
- etk_signal_connect("clicked", ETK_OBJECT(e->comment.revert),
ETK_CALLBACK(_ex_comment_revert_clicked_cb), e);
+ e->cur_tab->comment.entry = etk_entry_new();
+ 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");
+ etk_signal_connect("clicked", ETK_OBJECT(e->cur_tab->comment.revert),
ETK_CALLBACK(_ex_comment_revert_clicked_cb), e);
- e->comment.vbox2 = etk_vbox_new(ETK_FALSE, 0);
- e->comment.hbox = etk_hbox_new(ETK_FALSE, 0);
+ e->cur_tab->comment.vbox2 = etk_vbox_new(ETK_FALSE, 0);
+ e->cur_tab->comment.hbox = etk_hbox_new(ETK_FALSE, 0);
- etk_container_add(ETK_CONTAINER(e->comment.frame), e->comment.vbox2);
+ etk_container_add(ETK_CONTAINER(e->cur_tab->comment.frame),
e->cur_tab->comment.vbox2);
- etk_box_pack_start(ETK_BOX(e->comment.vbox2), e->comment.entry, ETK_TRUE,
ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->comment.vbox2), e->comment.hbox, ETK_FALSE,
ETK_FALSE, 0);
+ 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.hbox, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(e->comment.hbox), e->comment.revert, ETK_FALSE,
ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(e->comment.hbox), e->comment.save, 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);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.hbox),
e->cur_tab->comment.save, ETK_FALSE, ETK_FALSE, 0);
- e->comment.visible = ETK_TRUE;
+ e->cur_tab->comment.visible = ETK_TRUE;
etk_widget_show_all(ETK_WIDGET(e->hpaned));
}
@@ -42,19 +54,35 @@
void
_ex_comment_hide(Exhibit *e)
{
- if(!e->comment.visible)
+ if(!e->cur_tab->comment.visible)
return;
+
+ if(evas_list_count(e->tabs) == 1)
+ {
+ /* we only have 1 tab, ie, no notebook */
+ if (e->cur_tab->fit_window)
+ etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->alignment,
ETK_TRUE);
+ else
+ etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view,
ETK_TRUE);
+ }
+ else
+ {
+ /* we have multiple tabs */
+ if (e->cur_tab->fit_window)
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->alignment);
+ else
+ 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.save));
+ etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.revert));
+ etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.hbox));
+ etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.vbox2));
+ etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.frame));
+ etk_object_destroy(ETK_OBJECT(e->cur_tab->comment.vbox));
- etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view,
ETK_TRUE);
- etk_object_destroy(ETK_OBJECT(e->comment.entry));
- etk_object_destroy(ETK_OBJECT(e->comment.save));
- etk_object_destroy(ETK_OBJECT(e->comment.revert));
- etk_object_destroy(ETK_OBJECT(e->comment.hbox));
- etk_object_destroy(ETK_OBJECT(e->comment.vbox2));
- etk_object_destroy(ETK_OBJECT(e->comment.frame));
- etk_object_destroy(ETK_OBJECT(e->comment.vbox));
-
- e->comment.visible = ETK_FALSE;
+ e->cur_tab->comment.visible = ETK_FALSE;
}
void
@@ -68,10 +96,10 @@
if (_ex_file_is_jpg(file))
if (_ex_comment_jpeg_read(file, &comment, &len) && (len != 0))
{
- etk_entry_text_set(ETK_ENTRY(e->comment.entry), comment);
+ etk_entry_text_set(ETK_ENTRY(e->cur_tab->comment.entry), comment);
return;
}
- etk_entry_text_set(ETK_ENTRY(e->comment.entry), "");
+ etk_entry_text_set(ETK_ENTRY(e->cur_tab->comment.entry), "");
}
void
@@ -82,7 +110,7 @@
int len;
file = ((Ex_Tab *) e->cur_tab)->cur_file;
- comment = etk_entry_text_get(ETK_ENTRY(e->comment.entry));
+ comment = etk_entry_text_get(ETK_ENTRY(e->cur_tab->comment.entry));
if (comment)
len = strlen(comment);
else
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- exhibit_main.c 28 Jul 2006 16:04:47 -0000 1.50
+++ exhibit_main.c 29 Jul 2006 02:49:24 -0000 1.51
@@ -41,16 +41,38 @@
void
_ex_main_button_zoom_in_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
+ Exhibit *e;
e = data;
if (e->cur_tab->fit_window)
{
if(evas_list_count(e->tabs) == 1)
- etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view,
ETK_TRUE);
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->scrolled_view, ETK_TRUE);
+ }
else
- etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->comment.vbox);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+ }
etk_widget_size_request_set(e->cur_tab->alignment, -1, -1);
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view),
e->cur_tab->alignment);
@@ -69,16 +91,38 @@
void
_ex_main_button_zoom_out_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
+ Exhibit *e;
e = data;
if (e->cur_tab->fit_window)
{
- if(evas_list_count(e->tabs) == 1)
- etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view,
ETK_TRUE);
+ if(evas_list_count(e->tabs) == 1)
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->scrolled_view, ETK_TRUE);
+ }
else
- etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->comment.vbox);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+ }
etk_widget_size_request_set(e->cur_tab->alignment, -1, -1);
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view),
e->cur_tab->alignment);
@@ -104,9 +148,31 @@
if (e->cur_tab->fit_window)
{
if(evas_list_count(e->tabs) == 1)
- etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view,
ETK_TRUE);
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->scrolled_view, ETK_TRUE);
+ }
else
- etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->comment.vbox);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+ }
etk_widget_size_request_set(e->cur_tab->alignment, -1, -1);
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view),
e->cur_tab->alignment);
@@ -133,9 +199,31 @@
etk_widget_size_request_set(e->cur_tab->alignment, 10, 10);
if(evas_list_count(e->tabs) == 1)
- etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->alignment,
ETK_TRUE);
- else
- etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook), e->cur_tab->num,
e->cur_tab->alignment);
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->alignment, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->alignment,
ETK_TRUE);
+ }
+ else
+ {
+ if(e->cur_tab->comment.visible)
+ {
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->comment.vbox);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view);
+ etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->alignment, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ }
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->alignment);
+ }
etk_widget_size_request_set(e->cur_tab->image, -1, -1);
@@ -757,7 +845,6 @@
e->tabs = NULL;
e->slideshow.active = ETK_FALSE;
e->slideshow.interval = 5.0;
- e->comment.visible = ETK_FALSE;
e->options = _ex_options_new();
/* Now load saved options */
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- exhibit_menus.c 28 Jul 2006 16:04:47 -0000 1.19
+++ exhibit_menus.c 29 Jul 2006 02:49:24 -0000 1.20
@@ -360,7 +360,7 @@
etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0), NULL, &icol_string,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 1),NULL);
- if(!e->comment.visible)
+ if(!e->cur_tab->comment.visible)
{
_ex_comment_show(e);
_ex_comment_load(e);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- exhibit_tab.c 28 Jul 2006 16:04:47 -0000 1.13
+++ exhibit_tab.c 29 Jul 2006 02:49:24 -0000 1.14
@@ -19,6 +19,7 @@
tab->images = NULL;
tab->e = e;
tab->fit_window = ETK_FALSE;
+ tab->comment.visible = ETK_FALSE;
tab->dtree = etk_tree_new();
etk_widget_size_request_set(tab->dtree, 180, 120);
-------------------------------------------------------------------------
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
