Enlightenment CVS committal
Author : werkt
Project : misc
Module : ewler
Dir : misc/ewler/src
Modified Files:
callback_editor.c ewler.c form.c form_file.c inspector.c
layout.c main.c project.c selected.c
Log Message:
Fixed against api shifts in ewl.
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/callback_editor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- callback_editor.c 16 Aug 2004 14:58:28 -0000 1.1
+++ callback_editor.c 25 Aug 2004 01:41:38 -0000 1.2
@@ -83,21 +83,21 @@
hbox = ewl_hbox_new();
ewl_widget_internal_set(hbox, TRUE);
ewl_object_insets_set(EWL_OBJECT(hbox), 5, 5, 0, 0);
- ewl_box_set_spacing(EWL_BOX(hbox), 5);
+ ewl_box_spacing_set(EWL_BOX(hbox), 5);
ewl_object_fill_policy_set(EWL_OBJECT(hbox),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
- ewl_container_append_child(EWL_CONTAINER(ce), hbox);
+ ewl_container_child_append(EWL_CONTAINER(ce), hbox);
ewl_widget_show(hbox);
label = ewl_text_new( "Callback" );
ewl_widget_internal_set(label, TRUE);
ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_CENTER);
- ewl_container_append_child(EWL_CONTAINER(hbox), label);
+ ewl_container_child_append(EWL_CONTAINER(hbox), label);
ewl_widget_show(label);
ce->cb_combo = ewl_combo_new( "" );
ewl_widget_internal_set(ce->cb_combo, TRUE);
- ewl_container_append_child(EWL_CONTAINER(hbox), ce->cb_combo);
+ ewl_container_child_append(EWL_CONTAINER(hbox), ce->cb_combo);
ewl_object_fill_policy_set(EWL_OBJECT(ce->cb_combo), EWL_FLAG_FILL_HFILL);
ewl_widget_show(ce->cb_combo);
@@ -105,57 +105,57 @@
while( *cb_ptr != NULL ) {
menu_item = ewl_menu_item_new(NULL, *cb_ptr++);
- ewl_container_append_child(EWL_CONTAINER(ce->cb_combo), menu_item);
+ ewl_container_child_append(EWL_CONTAINER(ce->cb_combo), menu_item);
ewl_widget_show(menu_item);
}
hbox = ewl_hbox_new();
ewl_widget_internal_set(hbox, TRUE);
ewl_object_insets_set(EWL_OBJECT(hbox), 5, 5, 5, 5);
- ewl_box_set_spacing(EWL_BOX(hbox), 5);
+ ewl_box_spacing_set(EWL_BOX(hbox), 5);
ewl_object_fill_policy_set(EWL_OBJECT(hbox),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
- ewl_container_append_child(EWL_CONTAINER(ce), hbox);
+ ewl_container_child_append(EWL_CONTAINER(ce), hbox);
ewl_widget_show(hbox);
label = ewl_text_new( "Handler" );
ewl_widget_internal_set(label, TRUE);
ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_CENTER);
- ewl_container_append_child(EWL_CONTAINER(hbox), label);
+ ewl_container_child_append(EWL_CONTAINER(hbox), label);
ewl_widget_show(label);
ce->handler_entry = ewl_entry_new( "" );
ewl_widget_internal_set(ce->handler_entry, TRUE);
- ewl_container_append_child(EWL_CONTAINER(hbox), ce->handler_entry);
+ ewl_container_child_append(EWL_CONTAINER(hbox), ce->handler_entry);
ewl_widget_show(ce->handler_entry);
hbox = ewl_hbox_new();
ewl_widget_internal_set(hbox, TRUE);
- ewl_box_set_spacing(EWL_BOX(hbox), 5);
+ ewl_box_spacing_set(EWL_BOX(hbox), 5);
ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_RIGHT);
ewl_object_fill_policy_set(EWL_OBJECT(hbox),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
- ewl_container_append_child(EWL_CONTAINER(ce), hbox);
+ ewl_container_child_append(EWL_CONTAINER(ce), hbox);
ewl_widget_show(hbox);
button = ewl_button_new( "Add" );
ewl_widget_internal_set(ce->handler_entry, TRUE);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_RIGHT);
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_NONE);
- ewl_container_append_child(EWL_CONTAINER(hbox), button);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
ewl_widget_show(button);
separator = ewl_separator_new(EWL_ORIENTATION_HORIZONTAL);
ewl_widget_internal_set(separator, TRUE);
- ewl_container_append_child(EWL_CONTAINER(ce), separator);
+ ewl_container_child_append(EWL_CONTAINER(ce), separator);
ewl_widget_show(separator);
ce->tree = ewl_tree_new(2);
ewl_widget_internal_set(ce->tree, TRUE);
ewl_widget_appearance_set(EWL_TREE(ce->tree)->scrollarea, "entry" );
- ewl_tree_set_headers(EWL_TREE(ce->tree), headers);
+ ewl_tree_headers_set(EWL_TREE(ce->tree), headers);
ewl_object_fill_policy_set(EWL_OBJECT(ce->tree), EWL_FLAG_FILL_ALL );
- ewl_container_append_child(EWL_CONTAINER(ce), ce->tree);
+ ewl_container_child_append(EWL_CONTAINER(ce), ce->tree);
ewl_widget_show(ce->tree);
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/ewler.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewler.c 16 Aug 2004 14:58:28 -0000 1.8
+++ ewler.c 25 Aug 2004 01:41:38 -0000 1.9
@@ -67,7 +67,7 @@
ewl_widget_show( window );
dialog = ewl_filedialog_new( EWL_FILEDIALOG_TYPE_OPEN );
- ewl_container_append_child( EWL_CONTAINER(window), dialog );
+ ewl_container_child_append( EWL_CONTAINER(window), dialog );
ewl_callback_append( dialog, EWL_CALLBACK_VALUE_CHANGED,
__open_form_cb, window );
ewl_callback_append( window, EWL_CALLBACK_DELETE_WINDOW,
@@ -120,90 +120,90 @@
menu_layout = ewl_hbox_new();
ewl_object_fill_policy_set( EWL_OBJECT(menu_layout), EWL_FLAG_FILL_HFILL );
- ewl_container_append_child( EWL_CONTAINER(main_layout), menu_layout );
+ ewl_container_child_append( EWL_CONTAINER(main_layout), menu_layout );
ewl_widget_show( menu_layout );
separator = ewl_hseparator_new();
- ewl_container_append_child( EWL_CONTAINER(main_layout), separator );
+ ewl_container_child_append( EWL_CONTAINER(main_layout), separator );
ewl_widget_show( separator );
menu = ewl_imenu_new( NULL, "File" );
ewl_object_fill_policy_set( EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
- ewl_container_append_child( EWL_CONTAINER(menu_layout), menu );
+ ewl_container_child_append( EWL_CONTAINER(menu_layout), menu );
ewl_widget_show( menu );
menu_item = ewl_menu_item_new( PACKAGE_DATA_DIR"/images/form.png",
"New Form" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__create_new_form, NULL );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "New Project" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__create_new_project, NULL );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "Open" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__open_form, NULL );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "Open Project" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__open_project, NULL );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "Project Options..." );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__project_options, NULL );
ewl_widget_show( menu_item );
menu_item = EWL_WIDGET(ewl_menu_separator_new());
ewl_object_fill_policy_set( EWL_OBJECT(menu_item), EWL_FLAG_FILL_HFILL );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "Save" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__save, (void *) 0 );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "Save As" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__save, (void *) 1 );
ewl_widget_show( menu_item );
menu_item = EWL_WIDGET(ewl_menu_separator_new());
ewl_object_fill_policy_set( EWL_OBJECT(menu_item), EWL_FLAG_FILL_HFILL );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "Quit" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__destroy_main_window, NULL );
ewl_widget_show( menu_item );
menu = ewl_imenu_new( NULL, "Window" );
ewl_object_fill_policy_set( EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
- ewl_container_append_child( EWL_CONTAINER(menu_layout), menu );
+ ewl_container_child_append( EWL_CONTAINER(menu_layout), menu );
ewl_widget_show( menu );
menu_item = ewl_menu_item_new( NULL, "Inspector" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__toggle_inspector, NULL );
ewl_widget_show( menu_item );
menu_item = ewl_menu_item_new( NULL, "Project Overview" );
- ewl_container_append_child( EWL_CONTAINER(menu), menu_item );
+ ewl_container_child_append( EWL_CONTAINER(menu), menu_item );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__toggle_projects, NULL );
ewl_widget_show( menu_item );
@@ -218,7 +218,7 @@
void
tool_set_name( Ewl_Widget *w, void *ev_data, void *user_data )
{
- active_tool = ewl_button_get_label( EWL_BUTTON(w) );
+ active_tool = ewl_button_label_get( EWL_BUTTON(w) );
}
void
@@ -232,7 +232,7 @@
{
tool_tree = ewl_tree_new( 1 );
ewl_object_fill_policy_set( EWL_OBJECT(tool_tree), EWL_FLAG_FILL_SHRINK );
- ewl_container_append_child( EWL_CONTAINER(main_layout), tool_tree );
+ ewl_container_child_append( EWL_CONTAINER(main_layout), tool_tree );
ewler_populate_tools();
ewl_widget_show( tool_tree );
@@ -260,9 +260,9 @@
ewl_object_fill_policy_set( EWL_OBJECT(text[0]),
EWL_FLAG_FILL_NONE );
ewl_widget_show( text[0] );
- row = ewl_tree_add_row( EWL_TREE(tool_tree), EWL_ROW(prow),
text );
+ row = ewl_tree_row_add( EWL_TREE(tool_tree), EWL_ROW(prow),
text );
ewl_object_fill_policy_set( EWL_OBJECT(row->parent),
EWL_FLAG_FILL_FILL );
- ewl_tree_set_row_expand( EWL_ROW(row), EWL_TREE_NODE_EXPANDED
);
+ ewl_tree_row_expand_set( EWL_ROW(row), EWL_TREE_NODE_EXPANDED
);
add_tools_with_parent( class, row );
ewl_widget_show( row );
@@ -278,7 +278,7 @@
char *tool_header[] = { "Tools", NULL };
ewl_container_reset( EWL_CONTAINER(tool_tree) );
- ewl_tree_set_headers( EWL_TREE(tool_tree), tool_header );
+ ewl_tree_headers_set( EWL_TREE(tool_tree), tool_header );
add_tools_with_parent( NULL, NULL );
}
@@ -291,7 +291,7 @@
va_list ap;
dialog = ewl_dialog_new(EWL_POSITION_BOTTOM);
- ewl_window_set_title( EWL_WINDOW(dialog), "Error" );
+ ewl_window_title_set( EWL_WINDOW(dialog), "Error" );
ewl_callback_append( dialog, EWL_CALLBACK_DELETE_WINDOW,
__destroy_dialog, dialog );
@@ -301,10 +301,10 @@
text = ewl_text_new( buf );
ewl_object_padding_set( EWL_OBJECT(text), 5, 5, 5, 5 );
- ewl_container_prepend_child( EWL_CONTAINER(EWL_DIALOG(dialog)->vbox), text );
+ ewl_container_child_prepend( EWL_CONTAINER(EWL_DIALOG(dialog)->vbox), text );
ewl_widget_show( text );
- button = ewl_dialog_add_button( EWL_DIALOG(dialog),
+ button = ewl_dialog_button_add( EWL_DIALOG(dialog),
EWL_STOCK_OK, EWL_RESPONSE_OK );
ewl_callback_append( button, EWL_CALLBACK_CLICKED,
__destroy_dialog, dialog );
@@ -321,7 +321,7 @@
va_list ap;
dialog = ewl_dialog_new(EWL_POSITION_BOTTOM);
- ewl_window_set_title( EWL_WINDOW(dialog), "ewler" );
+ ewl_window_title_set( EWL_WINDOW(dialog), "ewler" );
ewl_callback_append( dialog, EWL_CALLBACK_DELETE_WINDOW,
__destroy_dialog, dialog );
if( no_cb )
@@ -333,17 +333,17 @@
text = ewl_text_new( buf );
ewl_object_padding_set( EWL_OBJECT(text), 5, 5, 5, 5 );
- ewl_container_prepend_child( EWL_CONTAINER(EWL_DIALOG(dialog)->vbox), text );
+ ewl_container_child_prepend( EWL_CONTAINER(EWL_DIALOG(dialog)->vbox), text );
ewl_widget_show( text );
- button = ewl_dialog_add_button( EWL_DIALOG(dialog),
+ button = ewl_dialog_button_add( EWL_DIALOG(dialog),
EWL_STOCK_OK, EWL_RESPONSE_OK );
ewl_callback_append( button, EWL_CALLBACK_CLICKED,
__destroy_dialog, dialog );
if( yes_cb )
ewl_callback_append( button, EWL_CALLBACK_CLICKED, yes_cb, user_data );
- button = ewl_dialog_add_button( EWL_DIALOG(dialog),
+ button = ewl_dialog_button_add( EWL_DIALOG(dialog),
EWL_STOCK_CANCEL, EWL_RESPONSE_CANCEL
);
ewl_callback_append( button, EWL_CALLBACK_CLICKED,
__destroy_dialog, dialog );
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/form.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- form.c 16 Aug 2004 14:58:28 -0000 1.15
+++ form.c 25 Aug 2004 01:41:38 -0000 1.16
@@ -260,7 +260,7 @@
ewl_callback_append( nw, EWL_CALLBACK_DESTROY,
__destroy_widget, form );
ewl_object_position_request( EWL_OBJECT(nw),
ev->x, ev->y );
- ewl_container_append_child(
EWL_CONTAINER(widget_container), nw );
+ ewl_container_child_append(
EWL_CONTAINER(widget_container), nw );
ewl_widget_show( nw );
s = ewler_selected_new( nw );
@@ -288,7 +288,7 @@
form->popup = ewl_imenu_new(NULL, "Configure");
ewl_object_position_request(EWL_OBJECT(form->popup), ev->x,
ev->y);
ewl_object_fill_policy_set(EWL_OBJECT(form->popup),
EWL_FLAG_FILL_NONE);
- ewl_container_append_child(EWL_CONTAINER(form->overlay),
form->popup);
+ ewl_container_child_append(EWL_CONTAINER(form->overlay),
form->popup);
ewl_widget_show(form->popup);
ewl_callback_call(form->popup, EWL_CALLBACK_SELECT);
@@ -297,7 +297,7 @@
layout_horizontal_cb, form );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__destroy_popup, form );
- ewl_container_append_child(EWL_CONTAINER(form->popup),
menu_item);
+ ewl_container_child_append(EWL_CONTAINER(form->popup),
menu_item);
ewl_widget_show(menu_item);
menu_item = ewl_menu_item_new(NULL, "Lay Out Vertically");
@@ -305,7 +305,7 @@
layout_vertical_cb, form );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__destroy_popup, form );
- ewl_container_append_child(EWL_CONTAINER(form->popup),
menu_item);
+ ewl_container_child_append(EWL_CONTAINER(form->popup),
menu_item);
ewl_widget_show(menu_item);
menu_item = ewl_menu_item_new(NULL, "Break Layout");
@@ -313,15 +313,15 @@
layout_break_cb, form );
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__destroy_popup, form );
- ewl_container_append_child(EWL_CONTAINER(form->popup),
menu_item);
+ ewl_container_child_append(EWL_CONTAINER(form->popup),
menu_item);
ewl_widget_show(menu_item);
menu_item = EWL_WIDGET(ewl_menu_separator_new());
- ewl_container_append_child(EWL_CONTAINER(form->popup),
menu_item);
+ ewl_container_child_append(EWL_CONTAINER(form->popup),
menu_item);
ewl_widget_show(menu_item);
menu_item = ewl_menu_item_new(NULL, "Edit Callbacks");
- ewl_container_append_child(EWL_CONTAINER(form->popup),
menu_item);
+ ewl_container_child_append(EWL_CONTAINER(form->popup),
menu_item);
ewl_callback_append( menu_item, EWL_CALLBACK_SELECT,
__destroy_popup, form );
#if 0
@@ -420,7 +420,7 @@
project_add_file( form->filename );
form->window = ewl_window_new();
- ewl_window_set_title( EWL_WINDOW(form->window), form->filename );
+ ewl_window_title_set( EWL_WINDOW(form->window), form->filename );
ewl_callback_append( form->window, EWL_CALLBACK_DELETE_WINDOW,
__destroy_form, form );
ewl_object_preferred_inner_size_set( EWL_OBJECT(form->window), 800, 600 );
@@ -433,9 +433,9 @@
form->overlay = ewl_overlay_new();
ewl_widget_appearance_set(form->overlay, "background");
- ewl_theme_data_set_str(form->overlay, "/background/file",
+ ewl_theme_data_str_set(form->overlay, "/background/file",
PACKAGE_DATA_DIR"/themes/ewler.eet");
- ewl_theme_data_set_str(form->overlay, "/background/group", "background");
+ ewl_theme_data_str_set(form->overlay, "/background/group", "background");
ewl_object_fill_policy_set( EWL_OBJECT(form->overlay), EWL_FLAG_FILL_ALL );
widget_create_info( form->overlay, "Ewl_Overlay", strdup( buf ) );
@@ -449,7 +449,7 @@
__mouse_move_widget, form );
ewl_callback_append( form->overlay, EWL_CALLBACK_KEY_DOWN,
__key_down_form, form );
- ewl_container_append_child( EWL_CONTAINER(form->window), form->overlay );
+ ewl_container_child_append( EWL_CONTAINER(form->window), form->overlay );
ewl_widget_data_set( form->overlay, "unsizable", (void *) 1 );
ewl_widget_show( form->overlay );
@@ -487,7 +487,7 @@
form->filename = strdup( filename );
form->has_been_saved = 1;
- ewl_window_set_title( EWL_WINDOW(form->window), title );
+ ewl_window_title_set( EWL_WINDOW(form->window), title );
form_save_file( form, 0 );
ewl_widget_destroy( w->parent );
} else
@@ -517,7 +517,7 @@
if( (path = project_get_path()) )
ewl_filedialog_set_directory( EWL_FILEDIALOG(dialog),
path );
- ewl_container_append_child( EWL_CONTAINER(window), dialog );
+ ewl_container_child_append( EWL_CONTAINER(window), dialog );
ewl_callback_append( dialog, EWL_CALLBACK_VALUE_CHANGED,
__save_form_cb, form );
ewl_callback_append( window, EWL_CALLBACK_DELETE_WINDOW,
@@ -546,7 +546,7 @@
form->filename = strdup( filename );
form->window = ewl_window_new();
- ewl_window_set_title( EWL_WINDOW(form->window), form->filename );
+ ewl_window_title_set( EWL_WINDOW(form->window), form->filename );
ewl_callback_append( form->window, EWL_CALLBACK_DELETE_WINDOW,
__destroy_form, form );
ewl_object_preferred_inner_size_set( EWL_OBJECT(form->window), 800, 600 );
@@ -572,9 +572,9 @@
ewl_object_fill_policy_set( EWL_OBJECT(form->overlay), EWL_FLAG_FILL_FILL );
ewl_widget_appearance_set(form->overlay, "background");
- ewl_theme_data_set_str(form->overlay, "/background/file",
+ ewl_theme_data_str_set(form->overlay, "/background/file",
PACKAGE_DATA_DIR"/themes/ewler.eet");
- ewl_theme_data_set_str(form->overlay, "/background/group", "background");
+ ewl_theme_data_str_set(form->overlay, "/background/group", "background");
ewl_callback_del_type( form->overlay, EWL_CALLBACK_MOUSE_DOWN );
ewl_callback_del_type( form->overlay, EWL_CALLBACK_MOUSE_UP );
@@ -590,7 +590,7 @@
__mouse_move_widget, form );
ewl_callback_append( form->overlay, EWL_CALLBACK_KEY_DOWN,
__key_down_form, form );
- ewl_container_append_child( EWL_CONTAINER(form->window), form->overlay );
+ ewl_container_child_append( EWL_CONTAINER(form->window), form->overlay );
form->selected = ecore_list_new();
form->has_been_saved = 1;
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/form_file.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- form_file.c 27 Jul 2004 13:51:05 -0000 1.3
+++ form_file.c 25 Aug 2004 01:41:38 -0000 1.4
@@ -181,7 +181,7 @@
exit( 1 );
}
if( parent ) {
- ewl_container_append_child(
EWL_CONTAINER(parent), cur );
+ ewl_container_child_append(
EWL_CONTAINER(parent), cur );
}
if( !cur ) {
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/inspector.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- inspector.c 16 Aug 2004 14:58:28 -0000 1.7
+++ inspector.c 25 Aug 2004 01:41:38 -0000 1.8
@@ -35,7 +35,7 @@
inspector_win = ewl_window_new();
- ewl_window_set_title( EWL_WINDOW(inspector_win), "Inspector" );
+ ewl_window_title_set( EWL_WINDOW(inspector_win), "Inspector" );
ewl_callback_append( inspector_win, EWL_CALLBACK_DELETE_WINDOW,
__hide_inspector_cb, NULL );
ewl_object_preferred_inner_size_set( EWL_OBJECT(inspector_win), 200, 400 );
@@ -43,7 +43,7 @@
ewl_object_fill_policy_set( EWL_OBJECT(inspector_win), EWL_FLAG_FILL_ALL );
inspector_tree = ewl_tree_new( 2 );
- ewl_tree_set_headers( EWL_TREE(inspector_tree), headers );
+ ewl_tree_headers_set( EWL_TREE(inspector_tree), headers );
ewl_object_fill_policy_set( EWL_OBJECT(inspector_tree), EWL_FLAG_FILL_ALL );
ewl_widget_show( inspector_tree );
@@ -51,19 +51,19 @@
ewl_widget_show( inspector_callback_editor );
inspector_notebook = ewl_notebook_new();
- ewl_container_append_child( EWL_CONTAINER(inspector_win),
+ ewl_container_child_append( EWL_CONTAINER(inspector_win),
inspector_notebook );
ewl_object_fill_policy_set( EWL_OBJECT(inspector_notebook),
EWL_FLAG_FILL_ALL );
tab = ewl_text_new( "Properties" );
ewl_widget_show( tab );
- ewl_notebook_append_page( EWL_NOTEBOOK(inspector_notebook),
+ ewl_notebook_page_append( EWL_NOTEBOOK(inspector_notebook),
tab, inspector_tree );
tab = ewl_text_new( "Callbacks" );
ewl_widget_show( tab );
- ewl_notebook_append_page( EWL_NOTEBOOK(inspector_notebook),
+ ewl_notebook_page_append( EWL_NOTEBOOK(inspector_notebook),
tab, inspector_callback_editor );
ewl_widget_show( inspector_notebook );
@@ -215,7 +215,7 @@
Ewl_Widget *text;
text = ewl_menu_item_new( NULL, node->key );
- ewl_container_append_child( EWL_CONTAINER(t_combo), text );
+ ewl_container_child_append( EWL_CONTAINER(t_combo), text );
ewl_widget_show( text );
}
@@ -274,7 +274,7 @@
break;
}
- row = ewl_tree_add_row( EWL_TREE(inspector_tree), EWL_ROW(prow), row_elems );
+ row = ewl_tree_row_add( EWL_TREE(inspector_tree), EWL_ROW(prow), row_elems );
ewl_callback_del_type( row->parent, EWL_CALLBACK_CLICKED );
ewl_widget_show( row );
@@ -298,18 +298,18 @@
ewl_container_child_iterate_begin( c );
- while( (row = ewl_container_next_child(c)) != EWL_TREE_NODE(c)->row )
+ while( (row = ewl_container_child_next(c)) != EWL_TREE_NODE(c)->row )
;
row = EWL_TREE_NODE(c)->row;
- cell = ewl_row_get_column( EWL_ROW(row), 1 );
+ cell = ewl_row_column_get( EWL_ROW(row), 1 );
if( cell ) {
ewl_container_child_iterate_begin( EWL_CONTAINER(cell) );
- entry = ewl_container_next_child( EWL_CONTAINER(cell) );
+ entry = ewl_container_child_next( EWL_CONTAINER(cell) );
if( entry ) {
static char buf[16];
@@ -328,7 +328,7 @@
}
}
- while( (node = ewl_container_next_child(c)) )
+ while( (node = ewl_container_child_next(c)) )
inspector_subupdate( EWL_CONTAINER(node) );
}
@@ -339,7 +339,7 @@
ewl_container_child_iterate_begin( EWL_CONTAINER(inspector_tree) );
- while( (node = ewl_container_next_child( EWL_CONTAINER(inspector_tree))) )
+ while( (node = ewl_container_child_next( EWL_CONTAINER(inspector_tree))) )
inspector_subupdate( EWL_CONTAINER(node) );
}
@@ -371,8 +371,8 @@
scroll = EWL_SCROLLPANE(EWL_TREE(inspector_tree)->scrollarea);
ewl_container_reset( EWL_CONTAINER(inspector_tree) );
- ewl_scrollpane_set_vscrollbar_value( scroll, 0.0 );
- ewl_scrollpane_set_hscrollbar_value( scroll, 0.0 );
+ ewl_scrollpane_vscrollbar_value_set( scroll, 0.0 );
+ ewl_scrollpane_hscrollbar_value_set( scroll, 0.0 );
if( w ) {
info = widget_get_info(w);
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/layout.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- layout.c 16 Aug 2004 14:58:28 -0000 1.4
+++ layout.c 25 Aug 2004 01:41:38 -0000 1.5
@@ -43,7 +43,7 @@
ecore_list_goto_first( cl );
while( (cw = ecore_list_remove( cl )) )
- ewl_container_append_child( EWL_CONTAINER(w), cw );
+ ewl_container_child_append( EWL_CONTAINER(w), cw );
ecore_list_destroy( cl );
@@ -60,7 +60,7 @@
if( s == form->overlay ) {
if( form->layout ) {
- ewl_box_set_orientation( EWL_BOX(form->layout), orientation );
+ ewl_box_orientation_set( EWL_BOX(form->layout), orientation );
} else {
Ecore_List *cl = ecore_list_new();
Ecore_List *pl = EWL_CONTAINER(form->overlay)->children;
@@ -79,7 +79,7 @@
form->layout = ewl_box_new(orientation);
widget_create_info( form->layout, "Ewl_Box", widget_name );
- ewl_box_set_orientation( EWL_BOX(form->layout), orientation );
+ ewl_box_orientation_set( EWL_BOX(form->layout), orientation );
ewl_object_position_request( EWL_OBJECT(form->layout), 0, 0 );
ewl_object_fill_policy_set( EWL_OBJECT(form->layout),
@@ -89,7 +89,7 @@
ewl_callback_append( form->layout, EWL_CALLBACK_REALIZE,
__layout_realize_cb, cl );
- ewl_container_append_child( EWL_CONTAINER(form->overlay),
form->layout );
+ ewl_container_child_append( EWL_CONTAINER(form->overlay),
form->layout );
form_add_widget( form, widget_name, form->layout );
ewl_widget_show( form->layout );
@@ -104,7 +104,7 @@
} else if( ecore_list_nodes( form->selected ) == 1 &&
(c_w =
ewler_selected_get(EWLER_SELECTED(s))) &&
widget_is_type( c_w, "Ewl_Box" ) ) {
- ewl_box_set_orientation( EWL_BOX(c_w), orientation );
+ ewl_box_orientation_set( EWL_BOX(c_w), orientation );
} else {
Ecore_List *cl = ecore_list_new();
@@ -124,7 +124,7 @@
box = ewl_box_new(orientation);
widget_create_info( box, "Ewl_Box", widget_name );
- ewl_box_set_orientation( EWL_BOX(box), orientation );
+ ewl_box_orientation_set( EWL_BOX(box), orientation );
s = ecore_list_goto_first( form->selected );
@@ -134,7 +134,7 @@
ewl_object_maximum_size_set( EWL_OBJECT(box), 100000, 100000 );
ewl_callback_append( box, EWL_CALLBACK_REALIZE, __layout_realize_cb,
cl );
- ewl_container_append_child( EWL_CONTAINER(parent), box );
+ ewl_container_child_append( EWL_CONTAINER(parent), box );
form_add_widget( form, widget_name, box );
ewl_widget_show( box );
@@ -208,7 +208,7 @@
ecore_list_goto_first( cl );
while( (cw = ecore_list_remove( cl )) ) {
- ewl_container_append_child( EWL_CONTAINER(np), cw );
+ ewl_container_child_append( EWL_CONTAINER(np), cw );
x = CURRENT_X(cw);
y = CURRENT_Y(cw);
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- main.c 16 Aug 2004 14:58:28 -0000 1.5
+++ main.c 25 Aug 2004 01:41:38 -0000 1.6
@@ -26,7 +26,7 @@
widgets_load( PACKAGE_DATA_DIR"/schemas/widgets.xml" );
main_win = ewl_window_new();
- ewl_window_set_title( EWL_WINDOW(main_win), "Ewler" );
+ ewl_window_title_set( EWL_WINDOW(main_win), "Ewler" );
ewl_callback_append( main_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_main_window, NULL );
ewl_object_fill_policy_set( EWL_OBJECT(main_win), EWL_FLAG_FILL_SHRINK );
@@ -36,7 +36,7 @@
main_layout = ewl_vbox_new();
ewl_object_fill_policy_set( EWL_OBJECT(main_layout), EWL_FLAG_FILL_SHRINK );
- ewl_container_append_child( EWL_CONTAINER(main_win), main_layout );
+ ewl_container_child_append( EWL_CONTAINER(main_win), main_layout );
ewl_widget_show( main_layout );
ewler_menu_init( main_layout );
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/project.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- project.c 16 Aug 2004 14:58:28 -0000 1.5
+++ project.c 25 Aug 2004 01:41:38 -0000 1.6
@@ -84,7 +84,7 @@
headers[1] = "";
ewl_container_reset( EWL_CONTAINER(project_tree) );
- ewl_tree_set_headers( EWL_TREE(project_tree), headers );
+ ewl_tree_headers_set( EWL_TREE(project_tree), headers );
} else {
ewler_error_dialog( "The current project has modified forms, a new "
"project cannot be created now." );
@@ -103,7 +103,7 @@
gettimeofday( &now, NULL );
- cell = ewl_row_get_column( EWL_ROW(w), 1 );
+ cell = ewl_row_column_get( EWL_ROW(w), 1 );
text = ecore_list_goto_first( EWL_CONTAINER(cell)->children );
@@ -144,7 +144,7 @@
{
project_win = ewl_window_new();
- ewl_window_set_title( EWL_WINDOW(project_win), "Project Overview" );
+ ewl_window_title_set( EWL_WINDOW(project_win), "Project Overview" );
ewl_object_minimum_size_set( EWL_OBJECT(project_win), 300, 200 );
ewl_object_insets_set( EWL_OBJECT(project_tree), 5, 5, 5, 5 );
@@ -154,7 +154,7 @@
project = NEW(Ewler_Project, 1);
project_tree = ewl_tree_new( 2 );
- ewl_container_append_child( EWL_CONTAINER(project_win), project_tree );
+ ewl_container_child_append( EWL_CONTAINER(project_win), project_tree );
__project_new_cb( NULL, NULL, NULL );
@@ -173,7 +173,7 @@
headers[1] = "";
ewl_container_reset( EWL_CONTAINER(project_tree) );
- ewl_tree_set_headers( EWL_TREE(project_tree), headers );
+ ewl_tree_headers_set( EWL_TREE(project_tree), headers );
sorted_list = ecore_sheap_new( ecore_str_compare,
ecore_list_nodes( project->members ) );
@@ -215,7 +215,7 @@
row_widgets[0] = image;
row_widgets[1] = text;
- row = ewl_tree_add_row( EWL_TREE(project_tree), NULL,
row_widgets );
+ row = ewl_tree_row_add( EWL_TREE(project_tree), NULL,
row_widgets );
ewl_callback_append( row, EWL_CALLBACK_MOUSE_DOWN,
__project_member_mouse_down, NULL );
ewl_widget_show( row );
@@ -394,41 +394,41 @@
options_dialog = ewl_dialog_new(EWL_POSITION_BOTTOM);
ewl_object_minimum_w_set( EWL_OBJECT(options_dialog), 400 );
- ewl_window_set_title( EWL_WINDOW(options_dialog), "Project Options" );
+ ewl_window_title_set( EWL_WINDOW(options_dialog), "Project Options" );
ewl_callback_append( options_dialog, EWL_CALLBACK_DELETE_WINDOW,
__destroy_dialog, options_dialog );
vbox = ewl_vbox_new();
- ewl_container_prepend_child( EWL_CONTAINER(EWL_DIALOG(options_dialog)->vbox),
+ ewl_container_child_prepend( EWL_CONTAINER(EWL_DIALOG(options_dialog)->vbox),
vbox );
ewl_widget_show( vbox );
hbox = ewl_hbox_new();
- ewl_container_append_child( EWL_CONTAINER(vbox), hbox );
+ ewl_container_child_append( EWL_CONTAINER(vbox), hbox );
ewl_widget_show( hbox );
label = ewl_text_new( "Project Directory:" );
params[1] = ewl_entry_new( project->path ? project->path : "" );
- ewl_container_append_child( EWL_CONTAINER(hbox), label );
- ewl_container_append_child( EWL_CONTAINER(hbox), params[1] );
+ ewl_container_child_append( EWL_CONTAINER(hbox), label );
+ ewl_container_child_append( EWL_CONTAINER(hbox), params[1] );
ewl_widget_show( label );
ewl_widget_show( params[1] );
hbox = ewl_hbox_new();
- ewl_container_append_child( EWL_CONTAINER(vbox), hbox );
+ ewl_container_child_append( EWL_CONTAINER(vbox), hbox );
ewl_widget_show( hbox );
label = ewl_text_new( "Project File:" );
params[2] = ewl_entry_new( project->filename ? project->filename : "" );
- ewl_container_append_child( EWL_CONTAINER(hbox), label );
- ewl_container_append_child( EWL_CONTAINER(hbox), params[2] );
+ ewl_container_child_append( EWL_CONTAINER(hbox), label );
+ ewl_container_child_append( EWL_CONTAINER(hbox), params[2] );
ewl_widget_show( label );
ewl_widget_show( params[2] );
- button = ewl_dialog_add_button( EWL_DIALOG(options_dialog),
+ button = ewl_dialog_button_add( EWL_DIALOG(options_dialog),
EWL_STOCK_OK, EWL_RESPONSE_OK );
ewl_callback_append( button, EWL_CALLBACK_CLICKED,
__apply_changes, NULL );
- button = ewl_dialog_add_button( EWL_DIALOG(options_dialog),
+ button = ewl_dialog_button_add( EWL_DIALOG(options_dialog),
EWL_STOCK_CANCEL, EWL_RESPONSE_CANCEL
);
ewl_callback_append( button, EWL_CALLBACK_CLICKED,
__destroy_dialog, options_dialog );
@@ -589,13 +589,13 @@
if( !project_close() ) {
window = ewl_window_new();
- ewl_window_set_title( EWL_WINDOW(window), "Open New Project" );
+ ewl_window_title_set( EWL_WINDOW(window), "Open New Project" );
ewl_object_minimum_size_set( EWL_OBJECT(window), 400, 600 );
ewl_widget_show( window );
dialog = ewl_filedialog_new( EWL_FILEDIALOG_TYPE_OPEN );
- ewl_container_append_child( EWL_CONTAINER(window), dialog );
+ ewl_container_child_append( EWL_CONTAINER(window), dialog );
ewl_callback_append( dialog, EWL_CALLBACK_VALUE_CHANGED,
__project_open_cb, NULL );
ewl_callback_append( dialog, EWL_CALLBACK_DELETE_WINDOW,
===================================================================
RCS file: /cvsroot/enlightenment/misc/ewler/src/selected.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- selected.c 16 Aug 2004 14:58:28 -0000 1.14
+++ selected.c 25 Aug 2004 01:41:38 -0000 1.15
@@ -61,12 +61,12 @@
if (!ewl_box_init(EWL_BOX(s), EWL_ORIENTATION_VERTICAL))
DRETURN_INT(FALSE, DLEVEL_STABLE);
ewl_widget_appearance_set(sw, "selected");
- ewl_theme_data_set_str(sw, "/selected/file",
+ ewl_theme_data_str_set(sw, "/selected/file",
PACKAGE_DATA_DIR"/themes/ewler.eet");
- ewl_theme_data_set_str(sw, "/selected/group", "selected");
+ ewl_theme_data_str_set(sw, "/selected/group", "selected");
ewl_widget_layer_set( sw, 0 );
- ewl_container_insert_child(parent, sw, index);
+ ewl_container_child_insert(parent, sw, index);
ewl_object_geometry_request(EWL_OBJECT(s),
CURRENT_X(w), CURRENT_Y(w),
CURRENT_W(w), CURRENT_H(w));
@@ -159,7 +159,7 @@
ewl_widget_state_set( w, "deselect" );
}
- ewl_container_append_child(EWL_CONTAINER(s), s->selected);
+ ewl_container_child_append(EWL_CONTAINER(s), s->selected);
if( ewl_widget_data_get( s->selected, "unsizable" ) )
return;
@@ -244,7 +244,7 @@
s = EWLER_SELECTED(w);
- ewl_container_nointercept_callback(EWL_CONTAINER(s), EWL_CALLBACK_MOUSE_DOWN);
+ ewl_container_callback_nointercept(EWL_CONTAINER(s), EWL_CALLBACK_MOUSE_DOWN);
ewl_object_current_geometry_get(EWL_OBJECT(s), &x, &y, &width, &height);
ewl_object_geometry_request(EWL_OBJECT(s->selected),
x, y, width, height);
@@ -264,7 +264,7 @@
evas_object_layer_set(w->theme_object, 1000);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN,
ewler_selected_mouse_down_cb, NULL);
- ewl_container_intercept_callback(EWL_CONTAINER(w), EWL_CALLBACK_MOUSE_DOWN);
+ ewl_container_callback_intercept(EWL_CONTAINER(w), EWL_CALLBACK_MOUSE_DOWN);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -307,7 +307,7 @@
Ewl_Event_Mouse_Move *ev = ev_data;
Ewler_Selected *s = EWLER_SELECTED(w);
- embed = ewl_embed_find_by_widget(w);
+ embed = ewl_embed_widget_find(w);
evas_event_feed_mouse_move(embed->evas, ev->x, ev->y);
@@ -362,24 +362,24 @@
if( ev->button == 1 ) {
form_set_widget_dragging( s->selected, ev );
- embed = ewl_embed_find_by_widget(w);
+ embed = ewl_embed_widget_find(w);
evas_event_feed_mouse_down(embed->evas, ev->button);
if( !form_widget_created() ) {
- ewl_container_nointercept_callback(EWL_CONTAINER(s),
+ ewl_container_callback_nointercept(EWL_CONTAINER(s),
EWL_CALLBACK_MOUSE_DOWN);
form_clear_widget_selected();
ecore_list_prepend( w_stack, s );
- ewl_embed_feed_mouse_down(embed, ev->button, ev->clicks,
+ ewl_embed_mouse_down_feed(embed, ev->button, ev->clicks,
ev->x, ev->y, ev->modifiers);
ecore_list_remove_first( w_stack );
ewl_callback_del_type(w, EWL_CALLBACK_MOUSE_DOWN);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN,
ewler_selected_mouse_down_cb, NULL);
- ewl_container_intercept_callback(EWL_CONTAINER(s),
+ ewl_container_callback_intercept(EWL_CONTAINER(s),
EWL_CALLBACK_MOUSE_DOWN);
form_set_widget_selected();
@@ -396,7 +396,7 @@
Ewl_Embed *embed;
Ewl_Event_Mouse_Up *ev = ev_data;
- embed = ewl_embed_find_by_widget(w);
+ embed = ewl_embed_widget_find(w);
evas_event_feed_mouse_move(embed->evas, ev->x, ev->y);
evas_event_feed_mouse_up(embed->evas, ev->button);
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
