Enlightenment CVS committal
Author : cmarcelo
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/bin
Modified Files:
etk_button_test.c etk_canvas_test.c etk_colorpicker_test.c
etk_combobox_test.c etk_dnd_test.c etk_entry_test.c
etk_filechooser_test.c etk_iconbox_test.c etk_image_test.c
etk_mdi_window_test.c etk_menu_test.c etk_notebook_test.c
etk_paned_test.c etk_progress_bar_test.c
etk_scrolled_view_test.c etk_shadow_test.c etk_slider_test.c
etk_stock.c etk_table_test.c etk_test.c etk_text_view_test.c
etk_tree_test.c
Log Message:
Use new signal codes API in etk_test
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_button_test.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_button_test.c 21 Aug 2007 15:04:53 -0000 1.19
+++ etk_button_test.c 28 Sep 2007 19:52:48 -0000 1.20
@@ -26,7 +26,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Button Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
table = etk_table_new(2, 2, ETK_TABLE_HHOMOGENEOUS);
etk_container_add(ETK_CONTAINER(win), table);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_canvas_test.c 21 Aug 2007 15:04:53 -0000 1.14
+++ etk_canvas_test.c 28 Sep 2007 19:52:48 -0000 1.15
@@ -22,7 +22,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Canvas Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 5);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -33,7 +33,7 @@
button = etk_button_new_from_stock(ETK_STOCK_LIST_ADD);
etk_button_label_set(ETK_BUTTON(button), "Add object");
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_canvas_object_add), canvas);
+ etk_signal_connect_swapped_by_code(ETK_BUTTON_CLICKED_SIGNAL,
ETK_OBJECT(button), ETK_CALLBACK(_etk_test_canvas_object_add), canvas);
etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_colorpicker_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_colorpicker_test.c 21 Aug 2007 15:04:53 -0000 1.9
+++ etk_colorpicker_test.c 28 Sep 2007 19:52:48 -0000 1.10
@@ -13,7 +13,7 @@
}
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Color Picker Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
cp = etk_colorpicker_new();
etk_colorpicker_use_alpha_set(ETK_COLORPICKER(cp), ETK_TRUE);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_combobox_test.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_combobox_test.c 21 Aug 2007 15:04:53 -0000 1.20
+++ etk_combobox_test.c 28 Sep 2007 19:52:48 -0000 1.21
@@ -59,7 +59,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Combobox Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -86,7 +86,7 @@
/* Create a simple combobox containing one column of labels and add 3 items
to it */
combobox = etk_combobox_entry_new();
- etk_signal_connect("active-item-changed", ETK_OBJECT(combobox),
ETK_CALLBACK(_etk_combobox_entry_active_item_changed_cb), NULL);
+ etk_signal_connect_by_code(ETK_COMBOBOX_ENTRY_ACTIVE_ITEM_CHANGED_SIGNAL,
ETK_OBJECT(combobox), ETK_CALLBACK(_etk_combobox_entry_active_item_changed_cb),
NULL);
etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(combobox),
ETK_COMBOBOX_ENTRY_IMAGE, 24, ETK_COMBOBOX_ENTRY_NONE, 0.0);
etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(combobox),
ETK_COMBOBOX_ENTRY_LABEL, 75, ETK_COMBOBOX_ENTRY_EXPAND, 0.0);
etk_combobox_entry_build(ETK_COMBOBOX_ENTRY(combobox));
@@ -105,7 +105,7 @@
for (i = 0; _keywords[i]; i++)
etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(combobox),
_keywords[i], NULL);
- etk_signal_connect("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(combobox))),
ETK_CALLBACK(_etk_combobox_entry_text_changed_cb), combobox);
+ etk_signal_connect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL,
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(combobox))),
ETK_CALLBACK(_etk_combobox_entry_text_changed_cb), combobox);
etk_container_add(ETK_CONTAINER(frame), combobox);
/*******************
@@ -142,7 +142,7 @@
etk_combobox_column_add(ETK_COMBOBOX(combobox), ETK_COMBOBOX_OTHER, 24,
ETK_COMBOBOX_NONE, 1.0);
etk_combobox_build(ETK_COMBOBOX(combobox));
etk_box_append(ETK_BOX(vbox), combobox, ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_signal_connect("active-item-changed", ETK_OBJECT(combobox),
ETK_CALLBACK(_active_item_changed_cb), image);
+ etk_signal_connect_by_code(ETK_COMBOBOX_ACTIVE_ITEM_CHANGED_SIGNAL,
ETK_OBJECT(combobox), ETK_CALLBACK(_active_item_changed_cb), image);
/* We fill the combobox with some stock-ids */
for (i = STARTING_STOCK_ID; i <= ENDING_STOCK_ID; i++)
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_dnd_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_dnd_test.c 21 Aug 2007 15:04:53 -0000 1.4
+++ etk_dnd_test.c 28 Sep 2007 19:52:48 -0000 1.5
@@ -3,11 +3,11 @@
#include <stdlib.h>
#include "config.h"
-static void _etk_test_dnd_drag_drop_cb(Etk_Object *object, void *event, void
*data);
-static void _etk_test_dnd_drag_motion_cb(Etk_Object *object, void *data);
-static void _etk_test_dnd_drag_leave_cb(Etk_Object *object, void *data);
-static void _etk_test_dnd_drag_drop_cb2(Etk_Object *object, void *event, void
*data);
-static void _etk_test_dnd_drag_drop_cb3(Etk_Object *object, void *event, void
*data);
+//static void _etk_test_dnd_drag_drop_cb(Etk_Object *object, void *event, void
*data);
+//static void _etk_test_dnd_drag_motion_cb(Etk_Object *object, void *data);
+//static void _etk_test_dnd_drag_leave_cb(Etk_Object *object, void *data);
+//static void _etk_test_dnd_drag_drop_cb2(Etk_Object *object, void *event,
void *data);
+//static void _etk_test_dnd_drag_drop_cb3(Etk_Object *object, void *event,
void *data);
/* Creates the window for the dnd test */
void etk_test_dnd_window_create(void *data)
@@ -34,7 +34,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Drag and Drop Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
/* create main box */
vbox = etk_vbox_new(ETK_FALSE, 3);
@@ -54,9 +54,9 @@
button = etk_button_new_with_label("Drop a file here (text/uri-list)");
etk_widget_dnd_dest_set(button, ETK_TRUE);
etk_widget_dnd_types_set(button, dnd_types, dnd_types_num);
- etk_signal_connect("drag-drop", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_drop_cb), label);
- etk_signal_connect("drag-motion", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_motion_cb), NULL);
- etk_signal_connect("drag-leave", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_leave_cb), NULL);
+ //etk_signal_connect("drag-drop", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_drop_cb), label);
+ //etk_signal_connect("drag-motion", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_motion_cb), NULL);
+ //etk_signal_connect("drag-leave", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_leave_cb), NULL);
etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -70,7 +70,7 @@
dnd_types = calloc(dnd_types_num, sizeof(char*));
dnd_types[0] = strdup("text/uri-list");
etk_widget_dnd_types_set(button, dnd_types, dnd_types_num);
- etk_signal_connect("drag-drop", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_drop_cb2), image);
+ //etk_signal_connect("drag-drop", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_dnd_drag_drop_cb2), image);
etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(vbox2), image, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -84,7 +84,7 @@
dnd_types[0] = strdup("text/plain");
etk_widget_dnd_types_set(entry, dnd_types, dnd_types_num);
etk_widget_dnd_dest_set(entry, ETK_TRUE);
- etk_signal_connect("drag-drop", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_test_dnd_drag_drop_cb3), NULL);
+ //etk_signal_connect("drag-drop", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_test_dnd_drag_drop_cb3), NULL);
etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(vbox2), entry, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -100,80 +100,80 @@
etk_widget_show_all(win);
}
-/* Called when a file is dropped on the button */
-static void _etk_test_dnd_drag_drop_cb(Etk_Object *object, void *event, void
*data)
-{
- Etk_Event_Selection_Request *ev;
- Etk_Selection_Data_Files *files;
-
- int i;
-
- ev = event;
-
- if(ev->content != ETK_SELECTION_CONTENT_FILES)
- return;
-
- files = ev->data;
-
- printf("Our test widget got a drop with %d files\n", files->num_files);
-
- for (i = 0; i < files->num_files; i++)
- {
- printf("Widget got the file: %s\n", files->files[i]);
- etk_label_set(ETK_LABEL(data), files->files[i]);
- }
-}
-
-/* Called when a file is dragged aboved the button */
-static void _etk_test_dnd_drag_motion_cb(Etk_Object *object, void *data)
-{
- printf("You're on top of me!\n");
-}
-
-/* Called when a file is dragged out of the button */
-static void _etk_test_dnd_drag_leave_cb(Etk_Object *object, void *data)
-{
- printf("You're leaving me!\n");
-}
-
-/* Called when a file is dropped on the second button */
-static void _etk_test_dnd_drag_drop_cb2(Etk_Object *object, void *event, void
*data)
-{
- Etk_Event_Selection_Request *ev;
- Etk_Selection_Data_Files *files;
- int i;
-
- ev = event;
-
- if(ev->content != ETK_SELECTION_CONTENT_FILES)
- return;
-
- files = ev->data;
-
- printf("Our test widget got a drop with %d files\n", files->num_files);
-
- for (i = 0; i < files->num_files; i++)
- {
- char *image;
-
- printf("Widget got the file: %s\n", files->files[i]);
- if ((image = strstr(files->files[i], "file://")) != NULL)
- etk_image_set_from_file(ETK_IMAGE(data), image + strlen("file://"),
NULL);
- }
-}
-
-/* Called when text is dropped on the entry */
-static void _etk_test_dnd_drag_drop_cb3(Etk_Object *object, void *event, void
*data)
-{
- Etk_Event_Selection_Request *ev;
- Etk_Selection_Data_Text *text;
-
- ev = event;
-
- if(ev->content != ETK_SELECTION_CONTENT_TEXT)
- return;
-
- text = ev->data;
-
- etk_entry_text_set(ETK_ENTRY(object), text->text);
-}
+// /* Called when a file is dropped on the button */
+// static void _etk_test_dnd_drag_drop_cb(Etk_Object *object, void *event,
void *data)
+// {
+// Etk_Event_Selection_Request *ev;
+// Etk_Selection_Data_Files *files;
+//
+// int i;
+//
+// ev = event;
+//
+// if(ev->content != ETK_SELECTION_CONTENT_FILES)
+// return;
+//
+// files = ev->data;
+//
+// printf("Our test widget got a drop with %d files\n", files->num_files);
+//
+// for (i = 0; i < files->num_files; i++)
+// {
+// printf("Widget got the file: %s\n", files->files[i]);
+// etk_label_set(ETK_LABEL(data), files->files[i]);
+// }
+// }
+//
+// /* Called when a file is dragged aboved the button */
+// static void _etk_test_dnd_drag_motion_cb(Etk_Object *object, void *data)
+// {
+// printf("You're on top of me!\n");
+// }
+//
+// /* Called when a file is dragged out of the button */
+// static void _etk_test_dnd_drag_leave_cb(Etk_Object *object, void *data)
+// {
+// printf("You're leaving me!\n");
+// }
+//
+// /* Called when a file is dropped on the second button */
+// static void _etk_test_dnd_drag_drop_cb2(Etk_Object *object, void *event,
void *data)
+// {
+// Etk_Event_Selection_Request *ev;
+// Etk_Selection_Data_Files *files;
+// int i;
+//
+// ev = event;
+//
+// if(ev->content != ETK_SELECTION_CONTENT_FILES)
+// return;
+//
+// files = ev->data;
+//
+// printf("Our test widget got a drop with %d files\n", files->num_files);
+//
+// for (i = 0; i < files->num_files; i++)
+// {
+// char *image;
+//
+// printf("Widget got the file: %s\n", files->files[i]);
+// if ((image = strstr(files->files[i], "file://")) != NULL)
+// etk_image_set_from_file(ETK_IMAGE(data), image +
strlen("file://"), NULL);
+// }
+// }
+//
+// /* Called when text is dropped on the entry */
+// static void _etk_test_dnd_drag_drop_cb3(Etk_Object *object, void *event,
void *data)
+// {
+// Etk_Event_Selection_Request *ev;
+// Etk_Selection_Data_Text *text;
+//
+// ev = event;
+//
+// if(ev->content != ETK_SELECTION_CONTENT_TEXT)
+// return;
+//
+// text = ev->data;
+//
+// etk_entry_text_set(ETK_ENTRY(object), text->text);
+// }
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_entry_test.c 21 Aug 2007 15:04:53 -0000 1.17
+++ etk_entry_test.c 28 Sep 2007 19:52:48 -0000 1.18
@@ -32,7 +32,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Entry Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -53,7 +53,7 @@
image = etk_image_new_from_stock(ETK_STOCK_DOCUMENT_PRINT, ETK_STOCK_SMALL);
etk_entry_image_set(ETK_ENTRY(_entry_normal), ETK_ENTRY_IMAGE_PRIMARY,
ETK_IMAGE(image));
- etk_signal_connect("mouse-click", ETK_OBJECT(image),
ETK_CALLBACK(_normal_print_cb), NULL);
+ etk_signal_connect_by_code(ETK_WIDGET_MOUSE_CLICK_SIGNAL,
ETK_OBJECT(image), ETK_CALLBACK(_normal_print_cb), NULL);
etk_entry_clear_button_add(ETK_ENTRY(_entry_normal));
_label_normal = etk_label_new(NULL);
@@ -94,7 +94,7 @@
button = etk_check_button_new_with_label("Password Visible");
etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_FILL, 0);
- etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_password_show_cb), entry);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(button), ETK_CALLBACK(_password_show_cb), entry);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_filechooser_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_filechooser_test.c 21 Aug 2007 15:04:54 -0000 1.9
+++ etk_filechooser_test.c 28 Sep 2007 19:52:48 -0000 1.10
@@ -43,7 +43,7 @@
dialog = etk_dialog_new();
etk_window_title_set(ETK_WINDOW(dialog), "Etk Filechooser Test");
- etk_signal_connect("delete-event", ETK_OBJECT(dialog),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL,
ETK_OBJECT(dialog), ETK_CALLBACK(etk_window_hide_on_delete), NULL);
filechooser = etk_filechooser_widget_new();
etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), filechooser,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -51,17 +51,17 @@
is_save_toggle = etk_check_button_new_with_label("Is save");
etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
is_save_toggle, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
- etk_signal_connect("toggled", ETK_OBJECT(is_save_toggle),
ETK_CALLBACK(on_checks_clicked), (void*)IS_SAVE);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(is_save_toggle), ETK_CALLBACK(on_checks_clicked), (void*)IS_SAVE);
select_multiple_toggle = etk_check_button_new_with_label("Select multiple");
etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
select_multiple_toggle, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
- etk_signal_connect("toggled", ETK_OBJECT(select_multiple_toggle),
ETK_CALLBACK(on_checks_clicked), (void*)SELECT_MULTI);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(select_multiple_toggle), ETK_CALLBACK(on_checks_clicked),
(void*)SELECT_MULTI);
show_hidden_toggle = etk_check_button_new_with_label("Show hidden");
etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
show_hidden_toggle, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
- etk_signal_connect("toggled", ETK_OBJECT(show_hidden_toggle),
ETK_CALLBACK(on_checks_clicked), (void*)SHOW_HIDDEN);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(show_hidden_toggle), ETK_CALLBACK(on_checks_clicked),
(void*)SHOW_HIDDEN);
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
ETK_STOCK_DOCUMENT_OPEN, 1);
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
ETK_STOCK_DIALOG_CLOSE, 2);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_iconbox_test.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_iconbox_test.c 21 Aug 2007 15:04:54 -0000 1.14
+++ etk_iconbox_test.c 28 Sep 2007 19:52:48 -0000 1.15
@@ -52,11 +52,11 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Iconbox Test");
etk_window_resize(ETK_WINDOW(win), 600, 330);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
iconbox = etk_iconbox_new();
etk_container_add(ETK_CONTAINER(win), iconbox);
- etk_signal_connect("mouse-down", ETK_OBJECT(iconbox),
ETK_CALLBACK(_etk_test_iconbox_mouse_down_cb), NULL);
+ etk_signal_connect_by_code(ETK_WIDGET_MOUSE_DOWN_SIGNAL,
ETK_OBJECT(iconbox), ETK_CALLBACK(_etk_test_iconbox_mouse_down_cb), NULL);
_etk_test_iconbox_folder_set(ETK_ICONBOX(iconbox), NULL);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_image_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_image_test.c 21 Aug 2007 15:04:54 -0000 1.11
+++ etk_image_test.c 28 Sep 2007 19:52:48 -0000 1.12
@@ -23,7 +23,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Image Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
/* TODO: we need a more complete test-app for Etk_Image */
/* Create two images with different "keep-aspect" property and pack theme
into a table */
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_mdi_window_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_mdi_window_test.c 20 Jul 2007 22:45:27 -0000 1.2
+++ etk_mdi_window_test.c 28 Sep 2007 19:52:48 -0000 1.3
@@ -24,7 +24,7 @@
etk_window_resize(ETK_WINDOW(win), 300, 300);
etk_window_title_set(ETK_WINDOW(win), "Etk Mdi Window Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
mdi_area = etk_mdi_area_new();
etk_container_add(ETK_CONTAINER(win), mdi_area);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etk_menu_test.c 21 Aug 2007 15:04:54 -0000 1.21
+++ etk_menu_test.c 28 Sep 2007 19:52:48 -0000 1.22
@@ -34,7 +34,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Menu Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_widget_size_request_set(win, 325, 240);
/****************
@@ -115,7 +115,7 @@
****************/
/* Main menu */
menu = etk_menu_new();
- etk_signal_connect("mouse-down", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_menu_window_down_cb), menu);
+ etk_signal_connect_by_code(ETK_WIDGET_MOUSE_DOWN_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_menu_window_down_cb), menu);
_etk_test_menu_stock_item_new("Open", ETK_STOCK_DOCUMENT_OPEN,
ETK_MENU_SHELL(menu));
_etk_test_menu_stock_item_new("Save", ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu));
_etk_test_menu_separator_new(ETK_MENU_SHELL(menu));
@@ -163,8 +163,8 @@
menu_item = etk_menu_item_new_with_label(label);
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
- etk_signal_connect("selected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
- etk_signal_connect("unselected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_SELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_UNSELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
return menu_item;
}
@@ -183,8 +183,8 @@
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
- etk_signal_connect("selected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
- etk_signal_connect("unselected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_SELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_UNSELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
return menu_item;
}
@@ -201,8 +201,8 @@
menu_item = etk_menu_item_check_new_with_label(label);
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
- etk_signal_connect("selected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
- etk_signal_connect("unselected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_SELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_UNSELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
return menu_item;
}
@@ -218,8 +218,8 @@
menu_item = etk_menu_item_radio_new_with_label_from_widget(label,
group_item);
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
- etk_signal_connect("selected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
- etk_signal_connect("unselected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_SELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_selected_cb), NULL);
+ etk_signal_connect_by_code(ETK_MENU_ITEM_UNSELECTED_SIGNAL,
ETK_OBJECT(menu_item), ETK_CALLBACK(_etk_test_menu_item_unselected_cb), NULL);
return menu_item;
}
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_notebook_test.c 21 Aug 2007 15:04:54 -0000 1.15
+++ etk_notebook_test.c 28 Sep 2007 19:52:48 -0000 1.16
@@ -31,7 +31,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Notebook Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -55,16 +55,16 @@
button = etk_button_new_from_stock(ETK_STOCK_GO_PREVIOUS);
etk_button_label_set(ETK_BUTTON(button), "Previous");
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(etk_notebook_page_prev), notebook);
+ etk_signal_connect_swapped_by_code(ETK_BUTTON_CLICKED_SIGNAL,
ETK_OBJECT(button), ETK_CALLBACK(etk_notebook_page_prev), notebook);
etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
button = etk_button_new_from_stock(ETK_STOCK_GO_NEXT);
etk_button_label_set(ETK_BUTTON(button), "Next");
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(etk_notebook_page_next), notebook);
+ etk_signal_connect_swapped_by_code(ETK_BUTTON_CLICKED_SIGNAL,
ETK_OBJECT(button), ETK_CALLBACK(etk_notebook_page_next), notebook);
etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
button = etk_toggle_button_new_with_label("Hide tabs");
- etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_hide_tabs_toggled_cb), notebook);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(button), ETK_CALLBACK(_hide_tabs_toggled_cb), notebook);
etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_paned_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_paned_test.c 21 Aug 2007 15:04:54 -0000 1.10
+++ etk_paned_test.c 28 Sep 2007 19:52:48 -0000 1.11
@@ -23,7 +23,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Paned Test");
etk_widget_size_request_set(win, 300, 300);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -63,13 +63,13 @@
check_button = etk_check_button_new_with_label("Child 1 Expand");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
- etk_signal_connect("toggled", ETK_OBJECT(check_button),
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check_button),
ETK_CALLBACK(_etk_test_paned_child1_expand_toggled_cb), hpaned);
etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
check_button = etk_check_button_new_with_label("Child 2 Expand");
etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check_button),
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check_button),
ETK_CALLBACK(_etk_test_paned_child2_expand_toggled_cb), hpaned);
@@ -81,13 +81,13 @@
check_button = etk_check_button_new_with_label("Child 1 Expand");
etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check_button),
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check_button),
ETK_CALLBACK(_etk_test_paned_child1_expand_toggled_cb), vpaned);
check_button = etk_check_button_new_with_label("Child 2 Expand");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check_button),
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check_button),
ETK_CALLBACK(_etk_test_paned_child2_expand_toggled_cb), vpaned);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_progress_bar_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_progress_bar_test.c 21 Aug 2007 15:04:54 -0000 1.9
+++ etk_progress_bar_test.c 28 Sep 2007 19:52:48 -0000 1.10
@@ -24,7 +24,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Progress Bar Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_TRUE, 5);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -41,8 +41,8 @@
_etk_test_progress_bar_timer = ecore_timer_add(0.05,
_etk_test_progress_bar_update, pbar);
_etk_test_progress_bar_timer2 = ecore_timer_add(0.025,
_etk_test_progress_bar_update2, pbar2);
- etk_signal_connect_swapped("destroyed", ETK_OBJECT(pbar),
ETK_CALLBACK(ecore_timer_del), _etk_test_progress_bar_timer);
- etk_signal_connect_swapped("destroyed", ETK_OBJECT(pbar2),
ETK_CALLBACK(ecore_timer_del), _etk_test_progress_bar_timer2);
+ etk_signal_connect_swapped_by_code(ETK_OBJECT_DESTROYED_SIGNAL,
ETK_OBJECT(pbar), ETK_CALLBACK(ecore_timer_del), _etk_test_progress_bar_timer);
+ etk_signal_connect_swapped_by_code(ETK_OBJECT_DESTROYED_SIGNAL,
ETK_OBJECT(pbar2), ETK_CALLBACK(ecore_timer_del),
_etk_test_progress_bar_timer2);
}
/* Updates the first progress bar */
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_scrolled_view_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_scrolled_view_test.c 21 Aug 2007 15:04:54 -0000 1.7
+++ etk_scrolled_view_test.c 28 Sep 2007 19:52:48 -0000 1.8
@@ -23,7 +23,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Scrolled View Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_widget_size_request_set(win, 180, 180);
scrolled_view = etk_scrolled_view_new();
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_shadow_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_shadow_test.c 21 Aug 2007 15:04:54 -0000 1.6
+++ etk_shadow_test.c 28 Sep 2007 19:52:48 -0000 1.7
@@ -45,7 +45,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Shadow Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vpaned = etk_vpaned_new();
etk_container_add(ETK_CONTAINER(win), vpaned);
@@ -115,14 +115,14 @@
slider = etk_hslider_new(-15.0, 15.0, 3.0, 1.0, 5.0);
etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
etk_table_attach(ETK_TABLE(table), slider, 1, 1, 0, 0, ETK_TABLE_HFILL |
ETK_TABLE_HEXPAND, 0, 0);
- etk_signal_connect("value-changed", ETK_OBJECT(slider),
_shadow_offset_x_changed_cb, NULL);
+ etk_signal_connect_by_code(ETK_RANGE_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(slider), _shadow_offset_x_changed_cb, NULL);
label = etk_label_new("Y");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, ETK_TABLE_HFILL, 0,
0);
slider = etk_hslider_new(-15.0, 15.0, 3.0, 1.0, 5.0);
etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
etk_table_attach(ETK_TABLE(table), slider, 1, 1, 1, 1, ETK_TABLE_HFILL |
ETK_TABLE_HEXPAND, 0, 0);
- etk_signal_connect("value-changed", ETK_OBJECT(slider),
_shadow_offset_y_changed_cb, NULL);
+ etk_signal_connect_by_code(ETK_RANGE_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(slider), _shadow_offset_y_changed_cb, NULL);
etk_box_append(ETK_BOX(hbox), etk_vseparator_new(), ETK_BOX_START,
ETK_BOX_NONE, 3);
@@ -134,12 +134,12 @@
slider = etk_hslider_new(0.0, 100.0, 15.0, 1.0, 10.0);
etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
etk_container_add(ETK_CONTAINER(frame), slider);
- etk_signal_connect("value-changed", ETK_OBJECT(slider),
_shadow_radius_changed_cb, NULL);
+ etk_signal_connect_by_code(ETK_RANGE_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(slider), _shadow_radius_changed_cb, NULL);
check = etk_check_button_new_with_label("Show the border");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check), _show_border_toggled_cb,
NULL);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), _show_border_toggled_cb, NULL);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_slider_test.c 21 Aug 2007 15:04:54 -0000 1.17
+++ etk_slider_test.c 28 Sep 2007 19:52:48 -0000 1.18
@@ -42,7 +42,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Slider Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
table = etk_table_new(2, 3, ETK_TABLE_HHOMOGENEOUS);
etk_container_add(ETK_CONTAINER(win), table);
@@ -59,13 +59,13 @@
_hslider = etk_hslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_slider_label_set(ETK_SLIDER(_hslider), "%.0f");
etk_table_attach(ETK_TABLE(table2), _hslider, 0, 0, 1, 1, ETK_TABLE_HEXPAND
| ETK_TABLE_HFILL, 0, 0);
- etk_signal_connect("value-changed", ETK_OBJECT(_hslider),
ETK_CALLBACK(_slider_value_changed_cb), NULL);
+ etk_signal_connect_by_code(ETK_RANGE_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(_hslider), ETK_CALLBACK(_slider_value_changed_cb), NULL);
/* Create the vertical slider */
_vslider = etk_vslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_slider_label_set(ETK_SLIDER(_vslider), "%.0f");
etk_table_attach(ETK_TABLE(table2), _vslider, 1, 1, 0, 0, ETK_TABLE_VEXPAND
| ETK_TABLE_VFILL, 0, 0);
- etk_signal_connect("value-changed", ETK_OBJECT(_vslider),
ETK_CALLBACK(_slider_value_changed_cb), NULL);
+ etk_signal_connect_by_code(ETK_RANGE_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(_vslider), ETK_CALLBACK(_slider_value_changed_cb), NULL);
separator = etk_hseparator_new();
etk_table_attach(ETK_TABLE(table), separator, 0, 1, 1, 1, ETK_TABLE_HFILL,
0, 0);
@@ -80,20 +80,20 @@
check = etk_check_button_new_with_label("Show Label");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_show_label_toggled_cb), _hslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_show_label_toggled_cb), _hslider);
check = etk_check_button_new_with_label("Inverted");
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_inverted_toggled_cb), _hslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_inverted_toggled_cb), _hslider);
check = etk_check_button_new_with_label("Continuous Update");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_continuous_toggled_cb), _hslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_continuous_toggled_cb), _hslider);
check = etk_check_button_new_with_label("Disabled");
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_disabled_toggled_cb), _hslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_disabled_toggled_cb), _hslider);
hbox = etk_hbox_new(ETK_FALSE, 5);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND, 0);
@@ -101,7 +101,7 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
_hspinner = etk_spinner_new(10.0, 1000.0, 255.0, 1.0, 10.0);
etk_box_append(ETK_BOX(hbox), _hspinner, ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_signal_connect("value-changed", ETK_OBJECT(_hspinner),
ETK_CALLBACK(_maximum_changed_cb), _hslider);
+ etk_signal_connect_by_code(ETK_RANGE_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(_hspinner), ETK_CALLBACK(_maximum_changed_cb), _hslider);
/* Create the settings frame for the vertical slider */
@@ -113,20 +113,20 @@
check = etk_check_button_new_with_label("Show Label");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_show_label_toggled_cb), _vslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_show_label_toggled_cb), _vslider);
check = etk_check_button_new_with_label("Inverted");
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_inverted_toggled_cb), _vslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_inverted_toggled_cb), _vslider);
check = etk_check_button_new_with_label("Continuous Update");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_continuous_toggled_cb), _vslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_continuous_toggled_cb), _vslider);
check = etk_check_button_new_with_label("Disabled");
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
ETK_CALLBACK(_disabled_toggled_cb), _vslider);
+ etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_OBJECT(check), ETK_CALLBACK(_disabled_toggled_cb), _vslider);
hbox = etk_hbox_new(ETK_FALSE, 5);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND, 0);
@@ -134,7 +134,7 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
_vspinner = etk_spinner_new(10.0, 1000.0, 255.0, 1.0, 10.0);
etk_box_append(ETK_BOX(hbox), _vspinner, ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_signal_connect("value-changed", ETK_OBJECT(_vspinner),
ETK_CALLBACK(_maximum_changed_cb), _vslider);
+ etk_signal_connect_by_code(ETK_RANGE_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(_vspinner), ETK_CALLBACK(_maximum_changed_cb), _vslider);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_stock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_stock.c 19 Sep 2007 14:02:25 -0000 1.1
+++ etk_stock.c 28 Sep 2007 19:52:48 -0000 1.2
@@ -241,7 +241,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Stock Test");
etk_window_resize(ETK_WINDOW(win), 450, 500);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_table_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_table_test.c 21 Aug 2007 15:04:54 -0000 1.15
+++ etk_table_test.c 28 Sep 2007 19:52:48 -0000 1.16
@@ -28,7 +28,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Table Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
/* First we create the widgets to pack into the table */
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png", NULL);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_test.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- etk_test.c 19 Sep 2007 14:01:48 -0000 1.38
+++ etk_test.c 28 Sep 2007 19:52:48 -0000 1.39
@@ -183,7 +183,8 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Test Application");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect_swapped("destroyed", ETK_OBJECT(win),
ETK_CALLBACK(_main_quit_cb), NULL);
+ etk_signal_connect_swapped_by_code(ETK_OBJECT_DESTROYED_SIGNAL,
ETK_OBJECT(win),
+ ETK_CALLBACK(_main_quit_cb), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -208,7 +209,9 @@
for (i = 0; i < _num_test_apps; i++)
{
button = etk_button_new_with_label(_test_apps[i].name);
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_test_apps[i].func), NULL);
+ etk_signal_connect_swapped_by_code(ETK_BUTTON_CLICKED_SIGNAL,
+ ETK_OBJECT(button),
+ ETK_CALLBACK(_test_apps[i].func), NULL);
j = current_ids[_test_apps[i].category]++;
etk_table_attach_default(ETK_TABLE(tables[_test_apps[i].category]),
button,
j % NUM_COLS, j % NUM_COLS, j / NUM_COLS, j / NUM_COLS);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_text_view_test.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_text_view_test.c 21 Aug 2007 15:04:54 -0000 1.19
+++ etk_text_view_test.c 28 Sep 2007 19:52:48 -0000 1.20
@@ -44,17 +44,17 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Text View Test");
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
button = etk_button_new_with_label("Tag Presentation");
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_text_view_tag_window_create), NULL);
+ etk_signal_connect_swapped_by_code(ETK_BUTTON_CLICKED_SIGNAL,
ETK_OBJECT(button), ETK_CALLBACK(_etk_test_text_view_tag_window_create), NULL);
etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_EXPAND, 0);
button = etk_button_new_with_label("Instant Messenger");
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_text_view_im_window_create), NULL);
+ etk_signal_connect_swapped_by_code(ETK_BUTTON_CLICKED_SIGNAL,
ETK_OBJECT(button), ETK_CALLBACK(_etk_test_text_view_im_window_create), NULL);
etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_EXPAND, 0);
etk_widget_show_all(win);
@@ -84,7 +84,7 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Text View Test");
etk_widget_size_request_set(win, 150, 150);
etk_window_resize(ETK_WINDOW(win), 400, 300);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -172,7 +172,7 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Text View Test: Instant
Messenger");
etk_window_resize(ETK_WINDOW(win), 300, 300);
etk_container_border_width_set(ETK_CONTAINER(win), 3);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vpaned = etk_vpaned_new();
etk_container_add(ETK_CONTAINER(win), vpaned);
@@ -204,7 +204,7 @@
editor_view = etk_text_view_new();
etk_widget_size_request_set(editor_view, 200, 80);
etk_box_append(ETK_BOX(vbox), editor_view, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
- etk_signal_connect("key-down", ETK_OBJECT(editor_view),
ETK_CALLBACK(_etk_test_im_editor_key_down_cb), message_view);
+ etk_signal_connect_by_code(ETK_WIDGET_KEY_DOWN_SIGNAL,
ETK_OBJECT(editor_view), ETK_CALLBACK(_etk_test_im_editor_key_down_cb),
message_view);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- etk_tree_test.c 21 Aug 2007 15:04:54 -0000 1.49
+++ etk_tree_test.c 28 Sep 2007 19:52:48 -0000 1.50
@@ -60,7 +60,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Tree Test");
etk_window_resize(ETK_WINDOW(win), 640, 500);
- etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect_by_code(ETK_WINDOW_DELETE_EVENT_SIGNAL, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -75,9 +75,9 @@
kinfo->vmin = 0;
kinfo->decel = 0.95;
etk_object_data_set(ETK_OBJECT(tree), "_Etk_Test_Tree::Kinetic_Info",
kinfo);
- etk_signal_connect("mouse-down", ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_mouse_down_cb), NULL);
- etk_signal_connect("mouse-up", ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_mouse_up_cb), NULL);
- etk_signal_connect("mouse-move", ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_mouse_move_cb), NULL);
+ etk_signal_connect_by_code(ETK_WIDGET_MOUSE_DOWN_SIGNAL, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_mouse_down_cb), NULL);
+ etk_signal_connect_by_code(ETK_WIDGET_MOUSE_UP_SIGNAL, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_mouse_up_cb), NULL);
+ etk_signal_connect_by_code(ETK_WIDGET_MOUSE_MOVE_SIGNAL, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_mouse_move_cb), NULL);
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_TREE);
etk_tree_multiple_select_set(ETK_TREE(tree), ETK_TRUE);
etk_widget_padding_set(tree, 5, 5, 5, 5);
@@ -158,23 +158,23 @@
button = etk_button_new_with_label("Sort the tree");
etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("clicked", ETK_OBJECT(button),
+ etk_signal_connect_by_code(ETK_BUTTON_CLICKED_SIGNAL, ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_sort_button_cb), col3);
button = etk_button_new_with_label("Insert a sorted row");
etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_signal_connect("clicked", ETK_OBJECT(button),
+ etk_signal_connect_by_code(ETK_BUTTON_CLICKED_SIGNAL, ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_insert_sorted_button_cb), ETK_TREE(tree));
/* Finally we create the statusbar used to display the events on the tree */
statusbar = etk_statusbar_new();
etk_box_append(ETK_BOX(vbox), statusbar, ETK_BOX_START, ETK_BOX_FILL, 0);
- etk_signal_connect("key-down", ETK_OBJECT(tree),
+ etk_signal_connect_by_code(ETK_WIDGET_KEY_DOWN_SIGNAL, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_key_down_cb), NULL);
- etk_signal_connect("row-clicked", ETK_OBJECT(tree),
+ etk_signal_connect_by_code(ETK_TREE_ROW_CLICKED_SIGNAL, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_row_clicked_cb), statusbar);
- etk_signal_connect("cell-value-changed", ETK_OBJECT(col5),
+ etk_signal_connect_by_code(ETK_TREE_COL_CELL_VALUE_CHANGED_SIGNAL,
ETK_OBJECT(col5),
ETK_CALLBACK(_etk_test_tree_checkbox_toggled_cb), statusbar);
etk_widget_show_all(win);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
