Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_filechooser_widget.c etk_tree.c
Log Message:
* More work on the filechooser
* Tree: Add the signals "row_clicked" and "row_activated" (emitted when the row
is double clicked or when the space bar is pressed on the selected row)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_filechooser_widget.c 12 Feb 2006 00:55:22 -0000 1.6
+++ etk_filechooser_widget.c 12 Feb 2006 12:27:49 -0000 1.7
@@ -60,9 +60,9 @@
static void _etk_filechooser_widget_property_get(Etk_Object *object, int
property_id, Etk_Property_Value *value);
static void _etk_filechooser_widget_size_request(Etk_Widget *widget, Etk_Size
*size_requisition);
static void _etk_filechooser_widget_size_allocate(Etk_Widget *widget,
Etk_Geometry geometry);
-static void _etk_filechooser_widget_place_selected_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data);
-static void _etk_filechooser_widget_fav_selected_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data);
-static void _etk_filechooser_widget_file_selected_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data);
+static void _etk_filechooser_widget_place_activated_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data);
+static void _etk_filechooser_widget_fav_activated_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data);
+static void _etk_filechooser_widget_file_activated_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data);
static void _etk_filechooser_widget_places_tree_fill(Etk_Filechooser_Widget
*fcw);
static void _etk_filechooser_widget_favs_tree_fill(Etk_Filechooser_Widget
*fcw);
@@ -88,7 +88,7 @@
};
static int _etk_filechooser_num_icons = sizeof(_etk_filechooser_icons) /
sizeof (_etk_filechooser_icons[0]);
-static char *_etk_filechooser_unsupported_fs[] = { "proc", "sysfs", "tmpfs",
"devpts", "usbfs" };
+static char *_etk_filechooser_unsupported_fs[] = { "proc", "sysfs", "tmpfs",
"devpts", "usbfs", "procfs", "devfs" };
static int _etk_filechooser_num_unsupported_fs =
sizeof(_etk_filechooser_unsupported_fs) / sizeof
(_etk_filechooser_unsupported_fs[0]);
/* static Etk_Signal
*_etk_filechooser_widget_signals[ETK_FILECHOOSER_WIDGET_NUM_SIGNALS]; */
@@ -320,7 +320,7 @@
etk_tree_build(ETK_TREE(fcw->places_tree));
etk_widget_show(fcw->places_tree);
etk_widget_visibility_locked_set(fcw->places_tree, ETK_TRUE);
- etk_signal_connect("row_selected", ETK_OBJECT(fcw->places_tree),
ETK_CALLBACK(_etk_filechooser_widget_place_selected_cb), fcw);
+ etk_signal_connect("row_activated", ETK_OBJECT(fcw->places_tree),
ETK_CALLBACK(_etk_filechooser_widget_place_activated_cb), fcw);
fcw->fav_tree = etk_tree_new();
etk_widget_size_request_set(fcw->fav_tree, 180, 180);
@@ -329,7 +329,7 @@
etk_tree_build(ETK_TREE(fcw->fav_tree));
etk_widget_show(fcw->fav_tree);
etk_widget_visibility_locked_set(fcw->fav_tree, ETK_TRUE);
- etk_signal_connect("row_selected", ETK_OBJECT(fcw->fav_tree),
ETK_CALLBACK(_etk_filechooser_widget_fav_selected_cb), fcw);
+ etk_signal_connect("row_activated", ETK_OBJECT(fcw->fav_tree),
ETK_CALLBACK(_etk_filechooser_widget_fav_activated_cb), fcw);
fcw->files_tree = etk_tree_new();
etk_widget_size_request_set(fcw->files_tree, 400, 120);
@@ -340,7 +340,7 @@
etk_tree_build(ETK_TREE(fcw->files_tree));
etk_widget_show(fcw->files_tree);
etk_widget_visibility_locked_set(fcw->files_tree, ETK_TRUE);
- etk_signal_connect("row_selected", ETK_OBJECT(fcw->files_tree),
ETK_CALLBACK(_etk_filechooser_widget_file_selected_cb), fcw);
+ etk_signal_connect("row_activated", ETK_OBJECT(fcw->files_tree),
ETK_CALLBACK(_etk_filechooser_widget_file_activated_cb), fcw);
_etk_filechooser_widget_places_tree_fill(ETK_FILECHOOSER_WIDGET(fcw));
_etk_filechooser_widget_favs_tree_fill(ETK_FILECHOOSER_WIDGET(fcw));
@@ -427,8 +427,8 @@
*
**************************/
-/* Called when a row of the "places" tree is selected */
-static void _etk_filechooser_widget_place_selected_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data)
+/* Called when a row of the "places" tree is activated (double-click or space)
*/
+static void _etk_filechooser_widget_place_activated_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data)
{
Etk_Filechooser_Widget *filechooser_widget;
char *selected_dir;
@@ -442,8 +442,8 @@
etk_filechooser_widget_current_folder_set(filechooser_widget,
selected_dir);
}
-/* Called when a row of the "favorites" tree is selected */
-static void _etk_filechooser_widget_fav_selected_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data)
+/* Called when a row of the "favorites" tree is activated (double-click or
space) */
+static void _etk_filechooser_widget_fav_activated_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data)
{
Etk_Filechooser_Widget *filechooser_widget;
@@ -452,22 +452,26 @@
etk_filechooser_widget_current_folder_set(filechooser_widget,
etk_tree_row_data_get(row));
}
-/* Called when a row of the "files" tree is selected */
-static void _etk_filechooser_widget_file_selected_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data)
+/* Called when a row of the "files" tree is activated (double-click or space)
*/
+static void _etk_filechooser_widget_file_activated_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data)
{
- /*Etk_Filechooser_Widget *filechooser_widget;
+ Etk_Filechooser_Widget *filechooser_widget;
char *selected_file;
- char *new_file;
+ char file_path[PATH_MAX];
if (!(filechooser_widget = ETK_FILECHOOSER_WIDGET(data)))
return;
etk_tree_row_fields_get(row, filechooser_widget->files_name_col, NULL,
NULL, &selected_file, NULL);
-
- new_file = malloc(strlen(filechooser_widget->current_folder) +
strlen(selected_file) + 2);
- sprintf(new_file, "%s/%s", filechooser_widget->current_folder,
selected_file);
- etk_filechooser_widget_current_file_set(filechooser_widget, new_file);
- free(new_file);*/
+ snprintf(file_path, PATH_MAX, "%s/%s", filechooser_widget->current_folder,
selected_file);
+
+ if (ecore_file_exists(file_path))
+ {
+ if (ecore_file_is_dir(file_path))
+ etk_filechooser_widget_current_folder_set(filechooser_widget,
file_path);
+ else /* TODO */
+ ;
+ }
}
/**************************
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_tree.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- etk_tree.c 12 Feb 2006 00:55:22 -0000 1.29
+++ etk_tree.c 12 Feb 2006 12:27:49 -0000 1.30
@@ -51,6 +51,8 @@
{
ETK_TREE_ROW_SELECTED_SIGNAL,
ETK_TREE_ROW_UNSELECTED_SIGNAL,
+ ETK_TREE_ROW_CLICKED_SIGNAL,
+ ETK_TREE_ROW_ACTIVATED_SIGNAL,
ETK_TREE_ROW_EXPANDED_SIGNAL,
ETK_TREE_ROW_COLLAPSED_SIGNAL,
ETK_TREE_SELECT_ALL_SIGNAL,
@@ -107,6 +109,7 @@
static void _etk_tree_expander_clicked_cb(Etk_Object *object, void
*event_info, void *data);
static void _etk_tree_row_pressed_cb(Etk_Object *object, void *event_info,
void *data);
+static void _etk_tree_row_clicked_cb(Etk_Object *object, void *event_info,
void *data);
static void _etk_tree_focus_cb(Etk_Object *object, void *event, void *data);
static void _etk_tree_unfocus_cb(Etk_Object *object, void *event, void *data);
static void _etk_tree_key_down_cb(Etk_Object *object, void *event, void *data);
@@ -156,6 +159,8 @@
_etk_tree_signals[ETK_TREE_ROW_SELECTED_SIGNAL] =
etk_signal_new("row_selected", tree_type, -1, etk_marshaller_VOID__POINTER,
NULL, NULL);
_etk_tree_signals[ETK_TREE_ROW_UNSELECTED_SIGNAL] =
etk_signal_new("row_unselected", tree_type, -1, etk_marshaller_VOID__POINTER,
NULL, NULL);
+ _etk_tree_signals[ETK_TREE_ROW_CLICKED_SIGNAL] =
etk_signal_new("row_clicked", tree_type, -1, etk_marshaller_VOID__POINTER,
NULL, NULL);
+ _etk_tree_signals[ETK_TREE_ROW_ACTIVATED_SIGNAL] =
etk_signal_new("row_activated", tree_type, -1, etk_marshaller_VOID__POINTER,
NULL, NULL);
_etk_tree_signals[ETK_TREE_ROW_EXPANDED_SIGNAL] =
etk_signal_new("row_expaned", tree_type, -1, etk_marshaller_VOID__POINTER,
NULL, NULL);
_etk_tree_signals[ETK_TREE_ROW_COLLAPSED_SIGNAL] =
etk_signal_new("row_collapsed", tree_type, -1, etk_marshaller_VOID__POINTER,
NULL, NULL);
_etk_tree_signals[ETK_TREE_SELECT_ALL_SIGNAL] =
etk_signal_new("select_all", tree_type, -1, etk_marshaller_VOID__VOID, NULL,
NULL);
@@ -1859,7 +1864,27 @@
return;
event = event_info;
- _etk_tree_row_select(row->tree, row, event->modifiers);
+ if (event->button == 1)
+ {
+ _etk_tree_row_select(row->tree, row, event->modifiers);
+ if (event->flags & EVAS_BUTTON_DOUBLE_CLICK)
+ etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_ACTIVATED_SIGNAL],
ETK_OBJECT(row->tree), NULL, row);
+ }
+
+}
+
+/* Called when a row is clicked */
+static void _etk_tree_row_clicked_cb(Etk_Object *object, void *event_info,
void *data)
+{
+ Etk_Tree_Row *row;
+ Etk_Event_Mouse_Up_Down *event;
+
+ if (!(row = etk_object_data_get(object, "_Etk_Tree::row")))
+ return;
+
+ event = event_info;
+ if (event->button == 1)
+ etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_CLICKED_SIGNAL],
ETK_OBJECT(row->tree), NULL, row);
}
/* Called when the tree is focused */
@@ -1935,6 +1960,11 @@
etk_range_value_set(vscrollbar_range, vscrollbar_range->value +
vscrollbar_range->page_increment);
else if (strcmp(key_event->key, "Prior") == 0)
etk_range_value_set(vscrollbar_range, vscrollbar_range->value -
vscrollbar_range->page_increment);
+ else if (strcmp(key_event->key, "space") == 0)
+ {
+ if (tree->last_selected)
+ etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_ACTIVATED_SIGNAL],
ETK_OBJECT(tree), NULL, tree->last_selected);
+ }
else
propagate = ETK_TRUE;
@@ -2365,6 +2395,7 @@
etk_widget_clip_set(new_row_objects->background,
ETK_TREE_GRID(tree->grid)->clip);
etk_widget_parent_set(new_row_objects->background,
ETK_CONTAINER(tree->grid));
etk_signal_connect("mouse_down", ETK_OBJECT(new_row_objects->background),
ETK_CALLBACK(_etk_tree_row_pressed_cb), NULL);
+ etk_signal_connect("mouse_click", ETK_OBJECT(new_row_objects->background),
ETK_CALLBACK(_etk_tree_row_clicked_cb), NULL);
/* Creates the expander of the row */
if (tree->mode == ETK_TREE_MODE_TREE)
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs