Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_main.h exhibit_tab.c
Log Message:
* Change dir on click and not on select
* We can now use mouse wheel to zoom or to change the image, even if the
mouse is not over the image
* Hides the scrollbars of the image view, and always show the
vscrollbar of the dir/image trees.
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- exhibit_main.c 29 Jul 2006 19:50:04 -0000 1.53
+++ exhibit_main.c 29 Jul 2006 20:58:47 -0000 1.54
@@ -307,7 +307,7 @@
}
void
-_ex_main_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row *row, void
*data)
+_ex_main_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row *row, void
*event, void *data)
{
Etk_Tree *tree;
char *dcol_string;
@@ -917,7 +917,7 @@
etk_paned_child1_set(ETK_PANED(e->hpaned), e->vpaned, ETK_FALSE);
e->table = etk_table_new(4, 4, ETK_FALSE);
- etk_paned_child1_set(ETK_PANED(e->vpaned), e->table, ETK_FALSE);
+ etk_paned_child1_set(ETK_PANED(e->vpaned), e->table, ETK_TRUE);
e->menu_bar = etk_menu_bar_new();
etk_table_attach(ETK_TABLE(e->table), e->menu_bar, 0, 4, 0, 0, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND);
@@ -997,10 +997,7 @@
e->zoom_in[0] = etk_button_new();
e->zoom_in[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "zoom_in");
- etk_widget_pass_mouse_events_set(e->zoom_in[1], ETK_TRUE);
- etk_widget_size_request_set(e->zoom_in[1], 33, 27);
- //etk_button_image_set(ETK_BUTTON(button), ETK_IMAGE(e->zoom_in[1]));
- etk_container_add(ETK_CONTAINER(e->zoom_in[0]), e->zoom_in[1]);
+ etk_button_image_set(ETK_BUTTON(e->zoom_in[0]), ETK_IMAGE(e->zoom_in[1]));
etk_signal_connect("clicked", ETK_OBJECT(e->zoom_in[0]),
ETK_CALLBACK(_ex_main_button_zoom_in_cb), e);
etk_table_attach(ETK_TABLE(e->table), e->zoom_in[0],
0, 0, 1, 1,
@@ -1008,10 +1005,7 @@
e->zoom_out[0] = etk_button_new();
e->zoom_out[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "zoom_out");
- etk_widget_pass_mouse_events_set(e->zoom_out[1], ETK_TRUE);
- etk_widget_size_request_set(e->zoom_out[1], 33, 27);
- //etk_button_image_set(ETK_BUTTON(e->zoom_out[0]),
ETK_IMAGE(e->zoom_out[1]));
- etk_container_add(ETK_CONTAINER(e->zoom_out[0]), e->zoom_out[1]);
+ etk_button_image_set(ETK_BUTTON(e->zoom_out[0]), ETK_IMAGE(e->zoom_out[1]));
etk_signal_connect("clicked", ETK_OBJECT(e->zoom_out[0]),
ETK_CALLBACK(_ex_main_button_zoom_out_cb), e);
etk_table_attach(ETK_TABLE(e->table), e->zoom_out[0],
1, 1, 1, 1,
@@ -1019,10 +1013,7 @@
e->fit[0] = etk_button_new();
e->fit[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj",
"fit_to_window");
- etk_widget_pass_mouse_events_set(e->fit[1], ETK_TRUE);
- etk_widget_size_request_set(e->fit[1], 33, 27);
- //etk_button_image_set(ETK_BUTTON(button), ETK_IMAGE(e->fit[1]));
- etk_container_add(ETK_CONTAINER(e->fit[0]), e->fit[1]);
+ etk_button_image_set(ETK_BUTTON(e->fit[0]), ETK_IMAGE(e->fit[1]));
etk_signal_connect("clicked", ETK_OBJECT(e->fit[0]),
ETK_CALLBACK(_ex_main_button_fit_to_window_cb), e);
etk_table_attach(ETK_TABLE(e->table), e->fit[0],
2, 2, 1, 1,
@@ -1030,10 +1021,7 @@
e->original[0] = etk_button_new();
e->original[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "one_to_one");
- etk_widget_pass_mouse_events_set(e->original[1], ETK_TRUE);
- etk_widget_size_request_set(e->original[1], 33, 27);
- //etk_button_image_set(ETK_BUTTON(e->original[0]),
ETK_IMAGE(e->original[1]));
- etk_container_add(ETK_CONTAINER(e->original[0]), e->original[1]);
+ etk_button_image_set(ETK_BUTTON(e->original[0]), ETK_IMAGE(e->original[1]));
etk_signal_connect("clicked", ETK_OBJECT(e->original[0]),
ETK_CALLBACK(_ex_main_button_zoom_one_to_one_cb), e);
etk_table_attach(ETK_TABLE(e->table), e->original[0],
3, 3, 1, 1,
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- exhibit_main.h 28 Jul 2006 16:04:47 -0000 1.7
+++ exhibit_main.h 29 Jul 2006 20:58:47 -0000 1.8
@@ -12,7 +12,7 @@
int _ex_main_itree_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
int _ex_main_itree_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
int _ex_main_itree_resol_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
-void _ex_main_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data);
+void _ex_main_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row
*row, void *event, void *data);
int _ex_main_dtree_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
void _ex_main_populate_files(Exhibit *e, const char *selected_file);
void _ex_main_entry_dir_key_down_cb(Etk_Object *object, void *event,
void *data);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- exhibit_tab.c 29 Jul 2006 19:50:04 -0000 1.15
+++ exhibit_tab.c 29 Jul 2006 20:58:47 -0000 1.16
@@ -23,9 +23,10 @@
tab->dtree = etk_tree_new();
etk_widget_size_request_set(tab->dtree, 180, 120);
- etk_signal_connect("row_selected", ETK_OBJECT(tab->dtree),
ETK_CALLBACK(_ex_main_dtree_item_clicked_cb), e);
+ etk_signal_connect("row_clicked", ETK_OBJECT(tab->dtree),
ETK_CALLBACK(_ex_main_dtree_item_clicked_cb), e);
tab->dcol = etk_tree_col_new(ETK_TREE(tab->dtree), "Directories",
etk_tree_model_icon_text_new(ETK_TREE(tab->dtree), ETK_TREE_FROM_EDJE), 10);
etk_tree_headers_visible_set(ETK_TREE(tab->dtree), 0);
+
etk_scrolled_view_policy_set(etk_tree_scrolled_view_get(ETK_TREE(tab->dtree)),
ETK_POLICY_AUTO, ETK_POLICY_SHOW);
etk_tree_build(ETK_TREE(tab->dtree));
tab->itree = etk_tree_new();
@@ -40,6 +41,7 @@
tab->icol = etk_tree_col_new(ETK_TREE(tab->itree), "Files", imodel, 10);
etk_tree_headers_visible_set(ETK_TREE(tab->itree), 0);
etk_tree_row_height_set(ETK_TREE(tab->itree), 60);
+
etk_scrolled_view_policy_set(etk_tree_scrolled_view_get(ETK_TREE(tab->itree)),
ETK_POLICY_AUTO, ETK_POLICY_SHOW);
etk_tree_build(ETK_TREE(tab->itree));
if(dir)
@@ -55,14 +57,16 @@
etk_signal_connect("mouse_down", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_down), e);
etk_signal_connect("mouse_up", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_up), e);
etk_signal_connect("mouse_move", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_move), e);
- etk_signal_connect("mouse_wheel", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_wheel), e);
etk_image_keep_aspect_set(ETK_IMAGE(tab->image), ETK_TRUE);
etk_container_add(ETK_CONTAINER(tab->alignment), tab->image);
tab->scrolled_view = etk_scrolled_view_new();
+ etk_scrolled_view_policy_set(ETK_SCROLLED_VIEW(tab->scrolled_view),
ETK_POLICY_HIDE, ETK_POLICY_HIDE);
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(tab->scrolled_view),
tab->alignment);
+ etk_widget_has_event_object_set(tab->scrolled_view, ETK_TRUE);
+ etk_signal_connect("mouse_wheel", ETK_OBJECT(tab->scrolled_view),
ETK_CALLBACK(_ex_image_mouse_wheel), e);
return tab;
}
-------------------------------------------------------------------------
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
