Enlightenment CVS committal Author : moom Project : e17 Module : proto
Dir : e17/proto/etk/src/lib Modified Files: etk_button.c etk_combobox.c etk_frame.c etk_iconbox.c etk_menu.c etk_menu_item.c etk_notebook.c etk_progress_bar.c etk_statusbar.c etk_toggle_button.c etk_tree.c etk_widget.c etk_widget.h Log Message: * Use "unsigned int boolean : 1" instead of "unsigned char boolean : 1" * etk_widget_theme_object_*() --> etk_widget_theme_*() =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- etk_button.c 26 Jul 2006 14:57:18 -0000 1.17 +++ etk_button.c 8 Aug 2006 17:02:48 -0000 1.18 @@ -407,7 +407,7 @@ return; if (button->is_pressed) - etk_widget_theme_object_signal_emit(ETK_WIDGET(button), "pressed"); + etk_widget_theme_signal_emit(ETK_WIDGET(button), "pressed"); } /* Called when the image is removed from the hbox */ @@ -499,7 +499,7 @@ { if (!button) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(button), "pressed"); + etk_widget_theme_signal_emit(ETK_WIDGET(button), "pressed"); } /* Default handler for the "released" signal */ @@ -507,7 +507,7 @@ { if (!button) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(button), "released"); + etk_widget_theme_signal_emit(ETK_WIDGET(button), "released"); } /* Default handler for the "clicked" signal */ @@ -515,7 +515,7 @@ { if (!button) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(button), "clicked"); + etk_widget_theme_signal_emit(ETK_WIDGET(button), "clicked"); } /* Creates the children of the button */ =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- etk_combobox.c 8 Aug 2006 00:57:33 -0000 1.20 +++ etk_combobox.c 8 Aug 2006 17:02:48 -0000 1.21 @@ -152,7 +152,7 @@ } else if (combobox->item_height_set) { - if (etk_widget_theme_object_data_get(ETK_WIDGET(combobox), "item_height", "%d", &combobox->item_height) != 1 || + if (etk_widget_theme_data_get(ETK_WIDGET(combobox), "item_height", "%d", &combobox->item_height) != 1 || combobox->item_height <= 0) { combobox->item_height = ETK_COMBOBOX_DEFAULT_ITEM_HEIGHT; @@ -1013,7 +1013,7 @@ if (!(combobox = ETK_COMBOBOX(widget))) return; - etk_widget_theme_object_signal_emit(combobox->button, "focus"); + etk_widget_theme_signal_emit(combobox->button, "focus"); } /* Default handler for the "unfocus" handler */ @@ -1023,7 +1023,7 @@ if (!(combobox = ETK_COMBOBOX(widget))) return; - etk_widget_theme_object_signal_emit(combobox->button, "unfocus"); + etk_widget_theme_signal_emit(combobox->button, "unfocus"); } /* Called when the combobox is realized */ @@ -1036,7 +1036,7 @@ if (!combobox->item_height_set) { - if (etk_widget_theme_object_data_get(ETK_WIDGET(combobox), "item_height", "%d", &combobox->item_height) != 1 || + if (etk_widget_theme_data_get(ETK_WIDGET(combobox), "item_height", "%d", &combobox->item_height) != 1 || combobox->item_height <= 0) { combobox->item_height = ETK_COMBOBOX_DEFAULT_ITEM_HEIGHT; @@ -1239,12 +1239,12 @@ if (combobox->selected_item) { - etk_widget_theme_object_signal_emit(ETK_WIDGET(combobox->selected_item), "unselect"); + etk_widget_theme_signal_emit(ETK_WIDGET(combobox->selected_item), "unselect"); combobox->selected_item = NULL; } if (item) { - etk_widget_theme_object_signal_emit(ETK_WIDGET(item), "select"); + etk_widget_theme_signal_emit(ETK_WIDGET(item), "select"); combobox->selected_item = item; } } =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_frame.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_frame.c 25 May 2006 21:07:00 -0000 1.7 +++ etk_frame.c 8 Aug 2006 17:02:48 -0000 1.8 @@ -82,13 +82,13 @@ { if (!frame->label || *frame->label == '\0') { - etk_widget_theme_object_part_text_set(ETK_WIDGET(frame), "label", ""); - etk_widget_theme_object_signal_emit(ETK_WIDGET(frame), "hide_label"); + etk_widget_theme_part_text_set(ETK_WIDGET(frame), "label", ""); + etk_widget_theme_signal_emit(ETK_WIDGET(frame), "hide_label"); } else { - etk_widget_theme_object_part_text_set(ETK_WIDGET(frame), "label", frame->label); - etk_widget_theme_object_signal_emit(ETK_WIDGET(frame), "show_label"); + etk_widget_theme_part_text_set(ETK_WIDGET(frame), "label", frame->label); + etk_widget_theme_signal_emit(ETK_WIDGET(frame), "show_label"); } } } =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_iconbox.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_iconbox.c 8 Aug 2006 00:57:33 -0000 1.9 +++ etk_iconbox.c 8 Aug 2006 17:02:48 -0000 1.10 @@ -1083,7 +1083,7 @@ if (!(iconbox = ETK_ICONBOX(object))) return; - if (etk_widget_theme_object_data_get(ETK_WIDGET(iconbox), "selected_icon_color", "%d %d %d %d", + if (etk_widget_theme_data_get(ETK_WIDGET(iconbox), "selected_icon_color", "%d %d %d %d", &iconbox->selected_icon_color.r, &iconbox->selected_icon_color.g, &iconbox->selected_icon_color.b, &iconbox->selected_icon_color.a) != 4) { @@ -1409,7 +1409,7 @@ label_geometry.h = model->label_height; etk_label_set(ETK_LABEL(icon_object->label), icon->label); - etk_widget_theme_object_signal_emit(icon_object->label, icon->selected ? "select" : "unselect"); + etk_widget_theme_signal_emit(icon_object->label, icon->selected ? "select" : "unselect"); if (clip && grid->clip) etk_widget_clip_set(icon_object->label, grid->clip); =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_menu.c 8 Aug 2006 00:57:33 -0000 1.16 +++ etk_menu.c 8 Aug 2006 17:02:48 -0000 1.17 @@ -194,12 +194,11 @@ item = ETK_MENU_ITEM(l->data); if (items_have_submenu) - etk_widget_theme_object_signal_emit(ETK_WIDGET(item), item->submenu ? "arrow_show" : "arrow_spacer"); + etk_widget_theme_signal_emit(ETK_WIDGET(item), item->submenu ? "arrow_show" : "arrow_spacer"); else - etk_widget_theme_object_signal_emit(ETK_WIDGET(item), "arrow_hide"); + etk_widget_theme_signal_emit(ETK_WIDGET(item), "arrow_hide"); - etk_widget_theme_object_signal_emit(ETK_WIDGET(item), - items_have_left_widget ? "left_widget_show" : "left_widget_hide"); + etk_widget_theme_signal_emit(ETK_WIDGET(item), items_have_left_widget ? "left_widget_show" : "left_widget_hide"); } y_offset = geometry.y; =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu_item.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- etk_menu_item.c 8 Aug 2006 16:33:00 -0000 1.18 +++ etk_menu_item.c 8 Aug 2006 17:02:48 -0000 1.19 @@ -154,7 +154,7 @@ free(menu_item->label); menu_item->label = label ? strdup(label) : NULL; - etk_widget_theme_object_part_text_set(ETK_WIDGET(menu_item), "label", label ? label : ""); + etk_widget_theme_part_text_set(ETK_WIDGET(menu_item), "label", label ? label : ""); etk_object_notify(ETK_OBJECT(menu_item), "label"); } @@ -188,9 +188,9 @@ ETK_MENU_SHELL(menu_item->submenu)->parent = menu_item; if (menu_item->submenu) - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "arrow_show"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "arrow_show"); else if (!menu_item->submenu) - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "arrow_hide"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "arrow_hide"); etk_widget_size_recalc_queue(ETK_WIDGET(menu_item)); } @@ -386,10 +386,10 @@ etk_widget_pass_mouse_events_set(menu_item->left_widget, ETK_TRUE); etk_widget_swallow_widget(ETK_WIDGET(menu_item), "left_widget_swallow", image_widget); - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "left_widget_show"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "left_widget_show"); } else - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "left_widget_hide"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "left_widget_hide"); etk_widget_size_recalc_queue(ETK_WIDGET(menu_item)); } @@ -653,8 +653,8 @@ etk_widget_parent_set(menu_item->left_widget, ETK_WIDGET(menu_item)); etk_widget_swallow_widget(ETK_WIDGET(menu_item), "left_widget_swallow", menu_item->left_widget); - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "left_widget_show"); - etk_widget_theme_object_signal_emit(menu_item->left_widget, check_item->active ? "check" : "uncheck"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "left_widget_show"); + etk_widget_theme_signal_emit(menu_item->left_widget, check_item->active ? "check" : "uncheck"); etk_signal_connect("realize", ETK_OBJECT(menu_item->left_widget), ETK_CALLBACK(_etk_menu_item_check_box_realize_cb), menu_item); @@ -844,7 +844,7 @@ if (!(menu_item = ETK_MENU_ITEM(object))) return; - etk_widget_theme_object_part_text_set(ETK_WIDGET(menu_item), "label", menu_item->label ? menu_item->label : ""); + etk_widget_theme_part_text_set(ETK_WIDGET(menu_item), "label", menu_item->label ? menu_item->label : ""); if (menu_item->left_widget) etk_widget_swallow_widget(ETK_WIDGET(menu_item), "left_widget_swallow", menu_item->left_widget); } @@ -856,7 +856,7 @@ if (!(menu_item = ETK_MENU_ITEM(data)) || !menu_item->left_widget) return; - etk_widget_theme_object_signal_emit(menu_item->left_widget, + etk_widget_theme_signal_emit(menu_item->left_widget, ETK_MENU_ITEM_CHECK(menu_item)->active ? "check" : "uncheck"); } @@ -875,8 +875,8 @@ { if (!menu_item) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "select"); - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item->left_widget), "select"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "select"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item->left_widget), "select"); } /* Default handler for the "deselected" signal */ @@ -884,8 +884,8 @@ { if (!menu_item) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "deselect"); - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item->left_widget), "deselect"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "deselect"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item->left_widget), "deselect"); } /* Default handler for the "activated" signal */ @@ -893,8 +893,8 @@ { if (!menu_item) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "activate"); - etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item->left_widget), "activate"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item), "activate"); + etk_widget_theme_signal_emit(ETK_WIDGET(menu_item->left_widget), "activate"); } /* Default handler for the "toggled" signal */ @@ -902,7 +902,7 @@ { if (check_item && ETK_MENU_ITEM(check_item)->left_widget) { - etk_widget_theme_object_signal_emit(ETK_MENU_ITEM(check_item)->left_widget, + etk_widget_theme_signal_emit(ETK_MENU_ITEM(check_item)->left_widget, check_item->active ? "check" : "uncheck"); } } =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_notebook.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- etk_notebook.c 8 Aug 2006 16:33:01 -0000 1.25 +++ etk_notebook.c 8 Aug 2006 17:02:48 -0000 1.26 @@ -696,7 +696,7 @@ return; if (notebook->current_page) - etk_widget_theme_object_signal_emit(notebook->current_page->tab, "focus"); + etk_widget_theme_signal_emit(notebook->current_page->tab, "focus"); notebook->tab_bar_focused = ETK_TRUE; } @@ -709,7 +709,7 @@ return; if (notebook->current_page) - etk_widget_theme_object_signal_emit(notebook->current_page->tab, "unfocus"); + etk_widget_theme_signal_emit(notebook->current_page->tab, "unfocus"); notebook->tab_bar_focused = ETK_FALSE; } @@ -830,7 +830,7 @@ { etk_widget_hide(notebook->current_page->frame); if (notebook->tab_bar_focused) - etk_widget_theme_object_signal_emit(notebook->current_page->tab, "unfocus"); + etk_widget_theme_signal_emit(notebook->current_page->tab, "unfocus"); } ETK_WIDGET(notebook)->focus_order = evas_list_free(ETK_WIDGET(notebook)->focus_order); @@ -844,7 +844,7 @@ etk_widget_raise(page->tab); if (notebook->tab_bar_focused) - etk_widget_theme_object_signal_emit(page->tab, "focus"); + etk_widget_theme_signal_emit(page->tab, "focus"); notebook->current_page = page; etk_signal_emit(_etk_notebook_signals[ETK_NOTEBOOK_PAGE_CHANGED_SIGNAL], ETK_OBJECT(notebook), NULL); =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_progress_bar.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_progress_bar.c 2 Jul 2006 04:01:19 -0000 1.12 +++ etk_progress_bar.c 8 Aug 2006 17:02:48 -0000 1.13 @@ -336,7 +336,7 @@ if (!(progress_bar = ETK_PROGRESS_BAR(object))) return; - if (etk_widget_theme_object_data_get(ETK_WIDGET(object), "filler_pulse_width", "%f", &w) != 1) + if (etk_widget_theme_data_get(ETK_WIDGET(object), "filler_pulse_width", "%f", &w) != 1) w = 0.3; progress_bar->filler_pulse_w = ETK_CLAMP(w, 0.1, 0.9); @@ -371,7 +371,7 @@ edje_object_part_drag_size_set(widget->theme_object, "filler", progress_bar->filler_pulse_w, 0.0); } - etk_widget_theme_object_part_text_set(widget, "text", progress_bar->text ? progress_bar->text : ""); + etk_widget_theme_part_text_set(widget, "text", progress_bar->text ? progress_bar->text : ""); } /** @} */ =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_statusbar.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_statusbar.c 14 May 2006 21:29:22 -0000 1.8 +++ etk_statusbar.c 8 Aug 2006 17:02:48 -0000 1.9 @@ -206,7 +206,7 @@ return; statusbar->has_resize_grip = has_resize_grip; - etk_widget_theme_object_signal_emit(ETK_WIDGET(statusbar), statusbar->has_resize_grip ? "show_resize_grip" : "hide_resize_grip"); + etk_widget_theme_signal_emit(ETK_WIDGET(statusbar), statusbar->has_resize_grip ? "show_resize_grip" : "hide_resize_grip"); etk_object_notify(ETK_OBJECT(statusbar), "has_resize_grip"); } @@ -304,7 +304,7 @@ /* Called when the status bar is realized */ static void _etk_statusbar_realize_cb(Etk_Object *object, void *data) { - etk_widget_theme_object_signal_emit(ETK_WIDGET(object), ETK_STATUSBAR(object)->has_resize_grip ? "show_resize_grip" : "hide_resize_grip"); + etk_widget_theme_signal_emit(ETK_WIDGET(object), ETK_STATUSBAR(object)->has_resize_grip ? "show_resize_grip" : "hide_resize_grip"); _etk_statusbar_update(ETK_STATUSBAR(object)); if (ETK_WIDGET(object)->theme_object) @@ -367,9 +367,9 @@ return; if (statusbar->msg_stack && (msg = statusbar->msg_stack->data) && msg->msg) - etk_widget_theme_object_part_text_set(ETK_WIDGET(statusbar), "message", msg->msg); + etk_widget_theme_part_text_set(ETK_WIDGET(statusbar), "message", msg->msg); else - etk_widget_theme_object_part_text_set(ETK_WIDGET(statusbar), "message", ""); + etk_widget_theme_part_text_set(ETK_WIDGET(statusbar), "message", ""); } /** @} */ =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toggle_button.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_toggle_button.c 7 Apr 2006 15:36:11 -0000 1.9 +++ etk_toggle_button.c 8 Aug 2006 17:02:48 -0000 1.10 @@ -180,7 +180,7 @@ if (!(toggle_button = ETK_TOGGLE_BUTTON(object))) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(toggle_button), toggle_button->active ? "activate" : "deactivate"); + etk_widget_theme_signal_emit(ETK_WIDGET(toggle_button), toggle_button->active ? "activate" : "deactivate"); } /* Default handler for the "toggled" signal */ @@ -188,7 +188,7 @@ { if (!toggle_button) return; - etk_widget_theme_object_signal_emit(ETK_WIDGET(toggle_button), toggle_button->active ? "activate" : "deactivate"); + etk_widget_theme_signal_emit(ETK_WIDGET(toggle_button), toggle_button->active ? "activate" : "deactivate"); } /************************** =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tree.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- etk_tree.c 8 Aug 2006 00:57:33 -0000 1.69 +++ etk_tree.c 8 Aug 2006 17:02:48 -0000 1.70 @@ -663,7 +663,7 @@ if (row_height < ETK_TREE_MIN_ROW_HEIGHT) { tree->use_default_row_height = ETK_TRUE; - if (etk_widget_theme_object_data_get(tree->grid, "row_height", "%d", &tree->row_height) != 1 || tree->row_height < ETK_TREE_MIN_ROW_HEIGHT) + if (etk_widget_theme_data_get(tree->grid, "row_height", "%d", &tree->row_height) != 1 || tree->row_height < ETK_TREE_MIN_ROW_HEIGHT) tree->row_height = ETK_TREE_MIN_ROW_HEIGHT; etk_range_increments_set(etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(tree->scrolled_view)), tree->row_height, 5 * tree->row_height); } @@ -1872,7 +1872,7 @@ return; tree = ETK_TREE_GRID(grid)->tree; - if (etk_widget_theme_object_data_get(grid, "separator_color", "%d %d %d %d", &tree->separator_color.r, &tree->separator_color.g, &tree->separator_color.b, &tree->separator_color.a) != 4) + if (etk_widget_theme_data_get(grid, "separator_color", "%d %d %d %d", &tree->separator_color.r, &tree->separator_color.g, &tree->separator_color.b, &tree->separator_color.a) != 4) { tree->separator_color.r = 255; tree->separator_color.g = 255; @@ -1882,12 +1882,12 @@ if (tree->use_default_row_height || tree->row_height < ETK_TREE_MIN_ROW_HEIGHT) { - if (etk_widget_theme_object_data_get(grid, "row_height", "%d", &tree->row_height) != 1 || tree->row_height < ETK_TREE_MIN_ROW_HEIGHT) + if (etk_widget_theme_data_get(grid, "row_height", "%d", &tree->row_height) != 1 || tree->row_height < ETK_TREE_MIN_ROW_HEIGHT) tree->row_height = ETK_TREE_MIN_ROW_HEIGHT; etk_range_increments_set(etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(tree->scrolled_view)), tree->row_height, 5 * tree->row_height); } - if (etk_widget_theme_object_data_get(grid, "cell_margins", "%d %d %d %d", &tree->cell_margins[0], &tree->cell_margins[1], &tree->cell_margins[2], &tree->cell_margins[3]) != 4) + if (etk_widget_theme_data_get(grid, "cell_margins", "%d %d %d %d", &tree->cell_margins[0], &tree->cell_margins[1], &tree->cell_margins[2], &tree->cell_margins[3]) != 4) { tree->cell_margins[0] = 0; tree->cell_margins[1] = 0; @@ -1895,7 +1895,7 @@ tree->cell_margins[3] = 0; } - if (etk_widget_theme_object_data_get(grid, "expander_size", "%d", &tree->expander_size) != 1) + if (etk_widget_theme_data_get(grid, "expander_size", "%d", &tree->expander_size) != 1) tree->expander_size = tree->row_height - 4; tree->expander_size = ETK_CLAMP(tree->expander_size, 1, tree->row_height); @@ -2167,7 +2167,7 @@ if (!(tree = ETK_TREE(object))) return; - etk_widget_theme_object_signal_emit(tree->grid, "focus"); + etk_widget_theme_signal_emit(tree->grid, "focus"); } /* Called when the tree is unfocused */ @@ -2177,7 +2177,7 @@ if (!(tree = ETK_TREE(object))) return; - etk_widget_theme_object_signal_emit(tree->grid, "unfocus"); + etk_widget_theme_signal_emit(tree->grid, "unfocus"); } /* Called when the user presses a key */ @@ -2915,7 +2915,7 @@ row->selected = ETK_TRUE; tree->last_selected = row; if(tree->dnd_event) - etk_widget_theme_object_signal_emit(ETK_WIDGET(tree), "row_selected"); + etk_widget_theme_signal_emit(ETK_WIDGET(tree), "row_selected"); else etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_SELECTED_SIGNAL], ETK_OBJECT(tree), NULL, row); } @@ -2971,7 +2971,7 @@ tree->last_selected = row; if(tree->dnd_event) - etk_widget_theme_object_signal_emit(ETK_WIDGET(tree), "row_selected"); + etk_widget_theme_signal_emit(ETK_WIDGET(tree), "row_selected"); else etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_SELECTED_SIGNAL], ETK_OBJECT(tree), NULL, row); } @@ -2983,7 +2983,7 @@ --tree->num_selected_rows; tree->last_selected = row; if(tree->dnd_event) - etk_widget_theme_object_signal_emit(ETK_WIDGET(tree), "row_selected"); + etk_widget_theme_signal_emit(ETK_WIDGET(tree), "row_selected"); else etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_SELECTED_SIGNAL], ETK_OBJECT(tree), NULL, row); } @@ -2993,7 +2993,7 @@ ++tree->num_selected_rows; tree->last_selected = row; if(tree->dnd_event) - etk_widget_theme_object_signal_emit(ETK_WIDGET(tree), "row_selected"); + etk_widget_theme_signal_emit(ETK_WIDGET(tree), "row_selected"); else etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_SELECTED_SIGNAL], ETK_OBJECT(tree), NULL, row); } @@ -3007,7 +3007,7 @@ row->selected = ETK_TRUE; tree->last_selected = row; if(tree->dnd_event) - etk_widget_theme_object_signal_emit(ETK_WIDGET(tree), "row_selected"); + etk_widget_theme_signal_emit(ETK_WIDGET(tree), "row_selected"); else etk_signal_emit(_etk_tree_signals[ETK_TREE_ROW_SELECTED_SIGNAL], ETK_OBJECT(tree), NULL, row); } =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -3 -r1.66 -r1.67 --- etk_widget.c 8 Aug 2006 15:55:55 -0000 1.66 +++ etk_widget.c 8 Aug 2006 17:02:48 -0000 1.67 @@ -1063,6 +1063,69 @@ } /** + * @brief Sends a signal to the theme object of the widget + * @param widget a widget + * @param signal_name the name of the signal to send + * @note The widget has to be realized, otherwise it will have no effect + * @widget_implementation + * @see edje_object_signal_emit() + */ +void etk_widget_theme_signal_emit(Etk_Widget *widget, const char *signal_name) +{ + if (!widget || !widget->theme_object) + return; + edje_object_signal_emit(widget->theme_object, signal_name, ""); + widget->need_theme_min_size_recalc = ETK_TRUE; +} + +/** + * @brief Sets the text of a text part of the theme object of the widget + * @param widget a widget + * @param part_name the name of the text part + * @param text the text to set + * @note The widget has to be realized, otherwise it will have no effect + * @widget_implementation + * @see edje_object_part_text_set() + */ +void etk_widget_theme_part_text_set(Etk_Widget *widget, const char *part_name, const char *text) +{ + if (!widget || !widget->theme_object) + return; + edje_object_part_text_set(widget->theme_object, part_name, text); + widget->need_theme_min_size_recalc = ETK_TRUE; +} + +/** + * @brief Gets the value of data from the theme of the widget + * @param widget a widget + * @param data_name the name of the data you want to get the value + * @param format the format of the data. Same format as the format argument of sscanf() + * @param ... the location of the variables where to store the values + * @return Returns the number of the input items successfully matched and assigned, same as sscanf + * @note The widget has to be realized, otherwise it will have no effect + * @widget_implementation + * @see edje_object_data_get() + */ +int etk_widget_theme_data_get(Etk_Widget *widget, const char *data_name, const char *format, ...) +{ + const char *data_string; + int result; + va_list args; + + if (!widget || !data_name || !format || !widget->theme_object) + return 0; + if (!(data_string = edje_object_data_get(widget->theme_object, data_name))) + return 0; + + /* TODO: remove that vsscanf compiler warning */ + va_start(args, format); + result = vsscanf(data_string, format, args); + va_end(args); + + return result; +} + +/** * @brief Makes the widget swallow another widget in a part of its theme object * @param swallower the widget that will swallow the widget @a to_swallow. @a swallower has to * be realized and to have a theme object @@ -1254,63 +1317,6 @@ } /** - * @brief Sends a signal to the theme object of the widget - * @param widget a widget - * @param signal_name the name of the signal to send - * @widget_implementation - */ -void etk_widget_theme_object_signal_emit(Etk_Widget *widget, const char *signal_name) -{ - if (!widget || !widget->theme_object) - return; - edje_object_signal_emit(widget->theme_object, signal_name, ""); - widget->need_theme_min_size_recalc = ETK_TRUE; -} - -/** - * @brief Sets a the text of a text part of the theme object of the widget - * @param widget a widget - * @param part_name the name of the text part - * @param text the text to set - * @widget_implementation - */ -void etk_widget_theme_object_part_text_set(Etk_Widget *widget, const char *part_name, const char *text) -{ - if (!widget || !widget->theme_object) - return; - edje_object_part_text_set(widget->theme_object, part_name, text); - widget->need_theme_min_size_recalc = ETK_TRUE; -} - -/** - * @brief Gets the value of data from the theme of the widget. The widget has to be realized - * @param widget a widget - * @param data_name the name of the data you want to get the value - * @param format the format of the data. Same format than the format argument of sscanf - * @param ... the location of the variables where to set the values - * @return Returns the number of the input items successfully matched and assigned, same as sscanf - * @widget_implementation - */ -int etk_widget_theme_object_data_get(Etk_Widget *widget, const char *data_name, const char *format, ...) -{ - const char *data_string; - int result; - va_list args; - - if (!widget || !data_name || !format || !widget->theme_object) - return 0; - if (!(data_string = edje_object_data_get(widget->theme_object, data_name))) - return 0; - - /* TODO: remove that vsscanf compiler warning */ - va_start(args, format); - result = vsscanf(data_string, format, args); - va_end(args); - - return result; -} - -/** * @brief Adds an evas object to the list of member objects of the widget. @n * A member object is automatically shown/hidden when the widget is shown/hidden, it is automatically clipped when the * widget is, and it is used by the widget to receive mouse events. @n @@ -1743,7 +1749,7 @@ return; /* TODO: FIXME: why isnt this being emitted automatically?!? */ - etk_widget_theme_object_signal_emit(widget, "drag_drop"); + etk_widget_theme_signal_emit(widget, "drag_drop"); etk_signal_emit(_etk_widget_signals[ETK_WIDGET_DRAG_DROP_SIGNAL], ETK_OBJECT(widget), NULL, event); } @@ -2091,7 +2097,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "enter"); + etk_widget_theme_signal_emit(widget, "enter"); } /* Default handler for the "leave" signal */ @@ -2099,7 +2105,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "leave"); + etk_widget_theme_signal_emit(widget, "leave"); } /* Default handler for the "focus" signal */ @@ -2107,7 +2113,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "focus"); + etk_widget_theme_signal_emit(widget, "focus"); } /* Default handler for the "unfocus" signal */ @@ -2115,7 +2121,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "unfocus"); + etk_widget_theme_signal_emit(widget, "unfocus"); } /* Sets the widget as visible and queues a visibility update */ @@ -2123,7 +2129,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "show"); + etk_widget_theme_signal_emit(widget, "show"); } /* Default handler for the "drag_drop" signal */ @@ -2131,7 +2137,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "drag_drop"); + etk_widget_theme_signal_emit(widget, "drag_drop"); } /* Default handler for the "drag_motion" signal */ @@ -2139,7 +2145,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "drag_motion"); + etk_widget_theme_signal_emit(widget, "drag_motion"); } /* Default handler for the "drag_enter" signal */ @@ -2147,7 +2153,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "drag_enter"); + etk_widget_theme_signal_emit(widget, "drag_enter"); } /* Default handler for the "drag_leave" signal */ @@ -2155,7 +2161,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "drag_leave"); + etk_widget_theme_signal_emit(widget, "drag_leave"); } /* Default handler for the "drag_begin" signal */ @@ -2163,7 +2169,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "drag_begin"); + etk_widget_theme_signal_emit(widget, "drag_begin"); } /* Default handler for the "drag_end" signal */ @@ -2171,7 +2177,7 @@ { if (!widget) return; - etk_widget_theme_object_signal_emit(widget, "drag_end"); + etk_widget_theme_signal_emit(widget, "drag_end"); } /* Evas Callback: Called when the mouse pointer enters the widget */ @@ -2532,7 +2538,7 @@ theme_parent = widget->theme_parent ? widget->theme_parent : widget->parent; if ((widget->theme_object = etk_theme_object_load_from_parent(evas, theme_parent, widget->theme_file, widget->theme_group))) { - if (etk_widget_theme_object_data_get(widget, "inset", "%d %d %d %d", + if (etk_widget_theme_data_get(widget, "inset", "%d %d %d %d", &widget->left_inset, &widget->right_inset, &widget->top_inset, &widget->bottom_inset) != 4) { widget->left_inset = 0; =================================================================== RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- etk_widget.h 4 Aug 2006 18:46:26 -0000 1.34 +++ etk_widget.h 8 Aug 2006 17:02:48 -0000 1.35 @@ -150,10 +150,8 @@ int left_inset, right_inset, top_inset, bottom_inset; Etk_Geometry geometry; Etk_Geometry inner_geometry; - /* The size requested by the user */ - Etk_Size requested_size; - /* The result of the last call to etk_widget_size_request() */ - Etk_Size last_size_requisition; + Etk_Size requested_size; /* The size requested by the user */ + Etk_Size last_size_requisition; /* The result of the last call to etk_widget_size_request() */ void (*size_request)(Etk_Widget *widget, Etk_Size *size_requisition); void (*size_allocate)(Etk_Widget *widget, Etk_Geometry geometry); @@ -176,27 +174,27 @@ void (*drag_begin)(Etk_Widget *widget); void (*drag_end)(Etk_Widget *widget); - unsigned char realized : 1; - unsigned char swallowed : 1; - unsigned char visible : 1; - unsigned char visibility_locked : 1; - unsigned char repeat_mouse_events : 1; - unsigned char pass_mouse_events : 1; - unsigned char has_event_object : 1; - unsigned char focusable : 1; - unsigned char focus_on_press : 1; - unsigned char use_focus_order : 1; - unsigned char need_size_recalc : 1; - unsigned char need_redraw : 1; - unsigned char need_theme_min_size_recalc : 1; - unsigned char accepts_dnd : 1; - unsigned char dnd_source : 1; - unsigned char dnd_dest : 1; - unsigned char dnd_internal: 1; - Etk_Widget *drag; - char **dnd_types; - int dnd_types_num; + char **dnd_types; + int dnd_types_num; + + unsigned int realized : 1; + unsigned int swallowed : 1; + unsigned int visible : 1; + unsigned int visibility_locked : 1; + unsigned int repeat_mouse_events : 1; + unsigned int pass_mouse_events : 1; + unsigned int has_event_object : 1; + unsigned int focusable : 1; + unsigned int focus_on_press : 1; + unsigned int use_focus_order : 1; + unsigned int need_size_recalc : 1; + unsigned int need_redraw : 1; + unsigned int need_theme_min_size_recalc : 1; + unsigned int accepts_dnd : 1; + unsigned int dnd_source : 1; + unsigned int dnd_dest : 1; + unsigned int dnd_internal: 1; }; Etk_Type *etk_widget_type_get(); @@ -204,6 +202,7 @@ void etk_widget_name_set(Etk_Widget *widget, const char *name); const char *etk_widget_name_get(Etk_Widget *widget); + void etk_widget_geometry_get(Etk_Widget *widget, int *x, int *y, int *w, int *h); void etk_widget_inner_geometry_get(Etk_Widget *widget, int *x, int *y, int *w, int *h); @@ -250,6 +249,10 @@ void etk_widget_focus(Etk_Widget *widget); void etk_widget_unfocus(Etk_Widget *widget); +void etk_widget_theme_signal_emit(Etk_Widget *widget, const char *signal_name); +void etk_widget_theme_part_text_set(Etk_Widget *widget, const char *part_name, const char *text); +int etk_widget_theme_data_get(Etk_Widget *widget, const char *data_name, const char *format, ...); + Etk_Bool etk_widget_swallow_widget(Etk_Widget *swallower, const char *part, Etk_Widget *to_swallow); void etk_widget_unswallow_widget(Etk_Widget *swallower, Etk_Widget *swallowed); Etk_Bool etk_widget_is_swallowing_widget(Etk_Widget *swallower, Etk_Widget *swallowed); @@ -259,13 +262,8 @@ Etk_Bool etk_widget_is_swallowing_object(Etk_Widget *swallower, Evas_Object *object); Etk_Widget_Swallow_Error etk_widget_swallow_error_get(); -void etk_widget_theme_object_signal_emit(Etk_Widget *widget, const char *signal_name); -void etk_widget_theme_object_part_text_set(Etk_Widget *widget, const char *part_name, const char *text); -int etk_widget_theme_object_data_get(Etk_Widget *widget, const char *data_name, const char *format, ...); - Etk_Bool etk_widget_member_object_add(Etk_Widget *widget, Evas_Object *object); void etk_widget_member_object_del(Etk_Widget *widget, Evas_Object *object); - void etk_widget_member_object_raise(Etk_Widget *widget, Evas_Object *object); void etk_widget_member_object_lower(Etk_Widget *widget, Evas_Object *object); void etk_widget_member_object_stack_above(Etk_Widget *widget, Evas_Object *object, Evas_Object *above); @@ -274,6 +272,7 @@ void etk_widget_clip_set(Etk_Widget *widget, Evas_Object *clip); void etk_widget_clip_unset(Etk_Widget *widget); Evas_Object *etk_widget_clip_get(Etk_Widget *widget); + void etk_widget_dnd_dest_set(Etk_Widget *widget, Etk_Bool on); Etk_Bool etk_widget_dnd_dest_get(Etk_Widget *widget); ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs