Enlightenment CVS committal Author : moom Project : e17 Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin Modified Files: exhibit_image.c exhibit_main.c exhibit_menus.c exhibit_options.c exhibit_tab.c Log Message: * Fix exhibit because of the recent API break of Etk =================================================================== RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_image.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- exhibit_image.c 10 Mar 2007 04:30:29 -0000 1.44 +++ exhibit_image.c 22 Mar 2007 19:43:19 -0000 1.45 @@ -656,7 +656,7 @@ fd->win = etk_window_new(); etk_window_title_set(ETK_WINDOW(fd->win), "Exhibit - Save image as .."); - etk_signal_connect("delete_event", ETK_OBJECT(fd->win), + etk_signal_connect("delete-event", ETK_OBJECT(fd->win), ETK_CALLBACK(etk_window_hide_on_delete), fd->win); vbox = etk_vbox_new(ETK_FALSE, 0); @@ -673,7 +673,7 @@ fd->entry = etk_entry_new(); etk_entry_text_set(ETK_ENTRY(fd->entry), e->cur_tab->cur_file); etk_box_append(ETK_BOX(vbox), fd->entry, ETK_BOX_START, ETK_BOX_EXPAND, 0); - etk_signal_connect("key_down", ETK_OBJECT(fd->entry), + etk_signal_connect("key-down", ETK_OBJECT(fd->entry), ETK_CALLBACK(_ex_image_save_as_entry_cb), fd); hbox = etk_hbox_new(ETK_FALSE, 0); =================================================================== RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- exhibit_main.c 21 Mar 2007 19:43:04 -0000 1.95 +++ exhibit_main.c 22 Mar 2007 19:43:19 -0000 1.96 @@ -611,7 +611,7 @@ { if (etk_window_fullscreen_get(ETK_WINDOW(e->win))) { - etk_signal_connect("resize", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_resize_cb), e); + etk_signal_connect("resized", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_resize_cb), e); etk_container_remove(ETK_CONTAINER(e->win), e->vboxf); etk_container_add(ETK_CONTAINER(e->win), e->vbox); etk_widget_show_all(e->win); @@ -786,14 +786,14 @@ dnd_types_num = 1; dnd_types = calloc(dnd_types_num, sizeof(char*)); dnd_types[0] = strdup("text/uri-list"); - etk_signal_connect("drag_drop", ETK_OBJECT(e->win), ETK_CALLBACK(_etk_main_drag_drop_cb), e); + etk_signal_connect("drag-drop", ETK_OBJECT(e->win), ETK_CALLBACK(_etk_main_drag_drop_cb), e); etk_widget_dnd_types_set(e->win, dnd_types, dnd_types_num); etk_window_title_set(ETK_WINDOW(e->win), WINDOW_TITLE " - Image Viewing the Kewl Way!"); etk_window_wmclass_set(ETK_WINDOW(e->win), "exhibit", "Exhibit"); etk_window_resize(ETK_WINDOW(e->win), e->options->last_w, e->options->last_h); - etk_signal_connect("delete_event", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_deleted_cb), e); - etk_signal_connect("key_down", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_key_down_cb), e); - etk_signal_connect("resize", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_resize_cb), e); + etk_signal_connect("delete-event", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_deleted_cb), e); + etk_signal_connect("key-down", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_key_down_cb), e); + etk_signal_connect("resized", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_resize_cb), e); e->vbox = etk_vbox_new(ETK_FALSE, 0); etk_container_add(ETK_CONTAINER(e->win), e->vbox); @@ -944,7 +944,7 @@ e->entry[0] = etk_entry_new(); etk_box_append(ETK_BOX(entry_hbox), e->entry[0], ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); - etk_signal_connect("key_down", ETK_OBJECT(e->entry[0]), ETK_CALLBACK(_ex_main_entry_dir_key_down_cb), e); + etk_signal_connect("key-down", ETK_OBJECT(e->entry[0]), ETK_CALLBACK(_ex_main_entry_dir_key_down_cb), e); e->entry[1] = etk_button_new_from_stock(ETK_STOCK_GO_NEXT); etk_button_label_set(ETK_BUTTON(e->entry[1]), NULL); @@ -1018,7 +1018,7 @@ e->notebook = etk_notebook_new(); etk_notebook_tabs_visible_set(ETK_NOTEBOOK(e->notebook), ETK_FALSE); etk_container_add(ETK_CONTAINER(e->hpaned_shadow), e->notebook); - etk_signal_connect("current_page_changed", ETK_OBJECT(e->notebook), + etk_signal_connect("current-page-changed", ETK_OBJECT(e->notebook), ETK_CALLBACK(_ex_main_window_tab_toggled_cb), NULL); e->hbox = etk_hbox_new(ETK_TRUE, 0); @@ -1031,7 +1031,7 @@ Etk_Widget *menu; menu = etk_menu_new(); - etk_signal_connect("mouse_down", ETK_OBJECT(e->sort_bar), ETK_CALLBACK(_ex_sort_label_mouse_down_cb), menu); + etk_signal_connect("mouse-down", ETK_OBJECT(e->sort_bar), ETK_CALLBACK(_ex_sort_label_mouse_down_cb), menu); _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by name"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL); _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by date"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL); _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by size"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL); =================================================================== RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- exhibit_menus.c 10 Mar 2007 04:30:29 -0000 1.42 +++ exhibit_menus.c 22 Mar 2007 19:43:19 -0000 1.43 @@ -494,7 +494,7 @@ win = etk_dialog_new(); etk_window_title_set(ETK_WINDOW(win), "About Exhibit"); - etk_signal_connect_swapped("delete_event", ETK_OBJECT(win), + etk_signal_connect_swapped("delete-event", ETK_OBJECT(win), ETK_CALLBACK(etk_window_hide_on_delete), win); etk_signal_connect_swapped("response", ETK_OBJECT(win), ETK_CALLBACK(etk_window_hide_on_delete), win); =================================================================== RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_options.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- exhibit_options.c 10 Mar 2007 04:30:29 -0000 1.21 +++ exhibit_options.c 22 Mar 2007 19:43:19 -0000 1.22 @@ -699,7 +699,7 @@ image = etk_image_new_from_stock(ETK_STOCK_UTILITIES_SYSTEM_MONITOR, ETK_STOCK_SMALL); dialog->sort_resolution = etk_combobox_item_append(ETK_COMBOBOX(dialog->default_sort), image, "Resolution"); - etk_signal_connect("active_item_changed", ETK_OBJECT(dialog->default_sort), + etk_signal_connect("active-item-changed", ETK_OBJECT(dialog->default_sort), ETK_CALLBACK(_ex_options_combobox_active_item_changed_cb), NULL); frame = etk_frame_new("Filesystem monitoring"); @@ -836,7 +836,7 @@ win = etk_window_new(); etk_window_title_set(ETK_WINDOW(win), "Exhibit options"); etk_container_border_width_set(ETK_CONTAINER(win), 5); - etk_signal_connect("delete_event", ETK_OBJECT(win), + etk_signal_connect("delete-event", ETK_OBJECT(win), ETK_CALLBACK(_ex_options_window_delete_cb), win); vbox = etk_vbox_new(ETK_FALSE, 3); =================================================================== RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_tab.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- exhibit_tab.c 10 Mar 2007 04:30:29 -0000 1.36 +++ exhibit_tab.c 22 Mar 2007 19:43:19 -0000 1.37 @@ -44,7 +44,7 @@ tab->dtree = etk_tree_new(); etk_widget_size_request_set(tab->dtree, 180, 120); - etk_signal_connect("row_clicked", ETK_OBJECT(tab->dtree), ETK_CALLBACK(_ex_tab_dtree_item_clicked_cb), e); + etk_signal_connect("row-clicked", ETK_OBJECT(tab->dtree), ETK_CALLBACK(_ex_tab_dtree_item_clicked_cb), e); tab->dcol = etk_tree_col_new(ETK_TREE(tab->dtree), "Directories", 10, 0.0); etk_tree_col_model_add(tab->dcol, etk_tree_model_image_new()); etk_tree_col_model_add(tab->dcol, etk_tree_model_text_new()); @@ -57,8 +57,8 @@ // etk_signal_connect("drag_begin", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_tree_drag_begin_cb), tab); etk_widget_size_request_set(tab->itree, 180, 220); etk_tree_multiple_select_set(ETK_TREE(tab->itree), ETK_TRUE); - etk_signal_connect("row_selected", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_itree_item_clicked_cb), e); - etk_signal_connect("key_down", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_itree_key_down_cb), e); + etk_signal_connect("row-selected", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_itree_item_clicked_cb), e); + etk_signal_connect("key-down", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_itree_key_down_cb), e); imodel = etk_tree_model_wobbly_new(); //etk_tree_model_image_width_set(imodel, 80, 0.0); tab->icol = etk_tree_col_new(ETK_TREE(tab->itree), "Files", 10, 0.0); @@ -79,10 +79,10 @@ tab->image = etk_image_new(); etk_widget_theme_file_set(tab->image, PACKAGE_DATA_DIR"/gui.edj"); etk_widget_theme_group_set(tab->image, "image_bg"); - 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_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); @@ -92,7 +92,7 @@ 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); + 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