From: Enlightenment C. <no...@cv...> - 2007-11-26 17:40:17
|
Enlightenment CVS committal Author : davemds Project : e17 Module : proto/edje_editor Dir : e17/proto/edje_editor/src/bin Modified Files: callbacks.c callbacks.h interface.c Log Message: * double click to open file in the filechooser =================================================================== RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- callbacks.c 26 Nov 2007 03:48:07 -0000 1.33 +++ callbacks.c 26 Nov 2007 17:40:12 -0000 1.34 @@ -1373,7 +1373,7 @@ /* Dialogs Callbacks */ Etk_Bool -on_FileChooser_response(Etk_Dialog *dialog, int response_id, void *data) +on_FileChooserDialog_response(Etk_Dialog *dialog, int response_id, void *data) { char cmd[4096]; int ret = 0; @@ -1473,6 +1473,13 @@ return ETK_TRUE; } +Etk_Bool +on_FileChooser_selected(Etk_Filechooser_Widget *filechooser) +{ + printf("*** FILECHOOSER SELECTD ON *** \n"); + on_FileChooserDialog_response(ETK_DIALOG(UI_FileChooserDialog), ETK_RESPONSE_OK, NULL); + return ETK_TRUE; +} Etk_Bool on_AlertDialog_response(Etk_Dialog *dialog, int response_id, void *data) { =================================================================== RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- callbacks.h 25 Nov 2007 18:42:55 -0000 1.15 +++ callbacks.h 26 Nov 2007 17:40:12 -0000 1.16 @@ -5,14 +5,10 @@ void ecore_delete_cb(Ecore_Evas *ee); //void on_GroupComboBox_changed (Etk_Combobox *combobox, void *data); -Etk_Bool on_GroupSpinner_value_changed (Etk_Range *range, double value, - void *data); -Etk_Bool on_canvas_geometry_changed (Etk_Object *canvas, - const char *property_name, void *data); -Etk_Bool on_PartsTree_row_selected (Etk_Object *object, Etk_Tree_Row *row, - void *data); -void on_ColorCanvas_click (void *data, Evas *e, Evas_Object *obj, - void *event_info); +Etk_Bool on_GroupSpinner_value_changed (Etk_Range *range, double value, void *data); +Etk_Bool on_canvas_geometry_changed (Etk_Object *canvas, const char *property_name, void *data); +Etk_Bool on_PartsTree_row_selected (Etk_Object *object, Etk_Tree_Row *row, void *data); +void on_ColorCanvas_click (void *data, Evas *e, Evas_Object *obj, void *event_info); Etk_Bool on_ColorDialog_change (Etk_Object *object, void *data); Etk_Bool on_PartNameEntry_text_changed (Etk_Object *object, void *data); Etk_Bool on_PartEventsCheck_toggled (Etk_Object *object, void *data); @@ -22,15 +18,15 @@ Etk_Bool on_RemoveMenu_item_activated (Etk_Object *object, void *data); Etk_Bool on_RelToComboBox_changed (Etk_Combobox *combobox, void *data); Etk_Bool on_TextEntry_text_changed (Etk_Object *object, void *data); -Etk_Bool on_FileChooser_response (Etk_Dialog *dialog, int response_id, - void *data); +Etk_Bool on_FileChooser_response (Etk_Dialog *dialog, int response_id,void *data); +Etk_Bool on_FileChooser_selected (Etk_Filechooser_Widget *filechooser); +Etk_Bool on_FileChooserDialog_response (Etk_Dialog *dialog, int response_id, void *data); Etk_Bool on_BorderSpinner_value_changed (Etk_Range *range, double value, void *data); Etk_Bool on_RelSpinner_value_changed (Etk_Range *range, double value, void *data); -Etk_Bool on_RelOffsetSpinner_value_changed (Etk_Range *range, double value, void *data); +Etk_Bool on_RelOffsetSpinner_value_changed (Etk_Range *range, double value, void *data); Etk_Bool on_FontComboBox_changed (Etk_Combobox *combobox, void *data); Etk_Bool on_FontSizeSpinner_value_changed (Etk_Range *range, double value, void *data); -Etk_Bool on_FileChooser_row_selected (Etk_Object *object, Etk_Tree_Row *row, - void *data); + Etk_Bool on_ColorCanvas_realize (Etk_Widget *canvas, void *data); Etk_Bool on_ImageAlphaSlider_value_changed (Etk_Object *object, double value, void *data); Etk_Bool on_ImageComboBox_changed (Etk_Combobox *combobox, void *data); =================================================================== RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- interface.c 26 Nov 2007 03:36:07 -0000 1.40 +++ interface.c 26 Nov 2007 17:40:12 -0000 1.41 @@ -970,12 +970,13 @@ UI_FileChooserDialog = etk_dialog_new(); etk_object_properties_set (ETK_OBJECT(UI_FileChooserDialog), "action-area-homogeneous",ETK_FALSE,NULL); etk_signal_connect("delete-event", ETK_OBJECT(UI_FileChooserDialog), ETK_CALLBACK(etk_window_hide_on_delete), NULL); - etk_signal_connect("response", ETK_OBJECT(UI_FileChooserDialog), ETK_CALLBACK(on_FileChooser_response), NULL); + etk_signal_connect("response", ETK_OBJECT(UI_FileChooserDialog), ETK_CALLBACK(on_FileChooserDialog_response), NULL); //Filechooser UI_FileChooser = etk_filechooser_widget_new(); etk_dialog_pack_in_main_area(ETK_DIALOG(UI_FileChooserDialog), UI_FileChooser, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0); + etk_signal_connect("selected", ETK_OBJECT(UI_FileChooser), ETK_CALLBACK(on_FileChooser_selected), NULL); etk_dialog_button_add_from_stock(ETK_DIALOG(UI_FileChooserDialog), ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL ); |