Enlightenment CVS committal Author : chaos Project : e17 Module : proto/entropy
Dir : e17/proto/entropy/src/plugins Modified Files: etk_list_viewer.c filesystem.c layout_etk_simple.c Log Message: eFolder creation dialog =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- etk_list_viewer.c 19 Aug 2007 01:50:06 -0000 1.89 +++ etk_list_viewer.c 1 Sep 2007 12:13:14 -0000 1.90 @@ -847,7 +847,7 @@ * value depending on SMALL, NORMAL, LARGE for etk_stock */ viewer->tree_col1 = etk_tree_col_new(ETK_TREE(viewer->tree), _("Icon"), 48,0.0); model = etk_tree_model_image_new(); - etk_tree_rows_height_set(ETK_TREE(viewer->tree), 48); + //etk_tree_rows_height_set(ETK_TREE(viewer->tree), 48); etk_tree_col_model_add(viewer->tree_col1, model); =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/plugins/filesystem.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- filesystem.c 30 Aug 2007 13:07:02 -0000 1.90 +++ filesystem.c 1 Sep 2007 12:13:14 -0000 1.91 @@ -41,6 +41,7 @@ Ecore_List* entropy_filesystem_metadata_groups_retrieve(); void entropy_filesystem_auth_response(char* location, char* user, char* password); void entropy_filesystem_meta_all_retrieve(); +void entropy_filesystem_vfolder_create(char* name, Evas_List* entries); static evfs_connection *con; @@ -503,6 +504,29 @@ } break; + case EVFS_EV_METAALL: { + entropy_gui_component_instance* instance = NULL; + entropy_gui_event* gui_event; + + instance = ecore_hash_get (evfs_dir_requests, (long*)data->command->client_identifier); + ecore_hash_remove (evfs_dir_requests, (long*)data->command->client_identifier); + + + + if (instance) { + /*Build up the gui_event wrapper */ + gui_event = entropy_malloc (sizeof (entropy_gui_event)); + gui_event->event_type = + entropy_core_gui_event_get (ENTROPY_GUI_EVENT_META_ALL_REQUEST); + + gui_event->data = EVFS_EVENT_META_ALL(data)->meta; + + entropy_core_layout_notify_event (instance, gui_event, + ENTROPY_EVENT_LOCAL); + } + } + break; + case EVFS_EV_AUTH_REQUIRED: { entropy_file_request* calling_request = NULL; @@ -632,6 +656,7 @@ plugin->file_functions.group_file_remove = &entropy_filesystem_file_group_remove; plugin->file_functions.auth_respond = entropy_filesystem_auth_response; plugin->misc_functions.meta_all_get = &entropy_filesystem_meta_all_retrieve; + plugin->misc_functions.vfolder_create = &entropy_filesystem_vfolder_create; return base; @@ -1184,4 +1209,21 @@ id = evfs_client_meta_list_all(con); ecore_hash_set (evfs_dir_requests, (long*)id, instance); +} + +void entropy_filesystem_vfolder_create(char* name, Evas_List* entries) +{ + evfs_command* com; + EvfsVfolderEntry* e; + Evas_List* l; + + com = evfs_vfolder_create_command_new(name); + for (l=entries;l;) { + e=l->data; + + evfs_vfolder_command_entry_add(com,e->type,e->name,e->value); + + l=l->next; + } + evfs_vfolder_command_send(con,com); } =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- layout_etk_simple.c 29 Aug 2007 04:55:06 -0000 1.79 +++ layout_etk_simple.c 1 Sep 2007 12:13:15 -0000 1.80 @@ -118,6 +118,18 @@ entropy_core_gui_event_get (ENTROPY_GUI_EVENT_METADATA_GROUPS)); + entropy_core_component_event_deregister (instance, + entropy_core_gui_event_get + (ENTROPY_GUI_EVENT_PASTE_REQUEST)); + + entropy_core_component_event_deregister (instance, + entropy_core_gui_event_get + (ENTROPY_GUI_EVENT_AUTH_REQUEST)); + + entropy_core_component_event_deregister (instance, + entropy_core_gui_event_get + (ENTROPY_GUI_EVENT_META_ALL_REQUEST)); + /*Deregister this layout*/ entropy_core_layout_deregister(instance->core, instance); @@ -481,6 +493,12 @@ etk_location_add_dialog_create((entropy_gui_component_instance*)data, layout_etk_simple_add_header); } +void _entropy_etk_efolder_dialog_show_cb(Etk_Object *obj, void *data) +{ + entropy_gui_component_instance* layout = (entropy_gui_component_instance*)data; + entropy_plugin_filesystem_metadata_all_get(layout); +} + void _entropy_etk_layout_key_down_cb(Etk_Object *object, void *event, void *data) @@ -682,6 +700,11 @@ } break; + case ENTROPY_NOTIFY_METADATA_ALL: { + entropy_etk_efolder_dialog_show((Evas_List*)el); + } + break; + } } @@ -776,6 +799,10 @@ entropy_core_gui_event_get (ENTROPY_GUI_EVENT_AUTH_REQUEST)); + entropy_core_component_event_register (layout, + entropy_core_gui_event_get + (ENTROPY_GUI_EVENT_META_ALL_REQUEST)); + /*Etk related init */ window = etk_window_new (); @@ -953,7 +980,7 @@ etk_signal_connect("activated", ETK_OBJECT(menu_item), ETK_CALLBACK(_location_add_cb), layout); menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("eFolder Wizard.."), ETK_STOCK_ADDRESS_BOOK_NEW, ETK_MENU_SHELL(menu), NULL); - etk_signal_connect("activated", ETK_OBJECT(menu_item), ETK_CALLBACK(entropy_etk_efolder_dialog_show), layout); + etk_signal_connect("activated", ETK_OBJECT(menu_item), ETK_CALLBACK(_entropy_etk_efolder_dialog_show_cb), layout); menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Program Associations.."), ETK_STOCK_EMBLEM_SYMBOLIC_LINK, ETK_MENU_SHELL(menu), NULL); ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs