Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_options.c exhibit_tab.c
Log Message:
* Update to etk_container_remove()/Etk_Table recent API break
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- exhibit_main.c 22 Mar 2007 19:43:19 -0000 1.96
+++ exhibit_main.c 25 Mar 2007 18:38:03 -0000 1.97
@@ -612,7 +612,7 @@
if (etk_window_fullscreen_get(ETK_WINDOW(e->win)))
{
etk_signal_connect("resized", ETK_OBJECT(e->win),
ETK_CALLBACK(_ex_main_window_resize_cb), e);
- etk_container_remove(ETK_CONTAINER(e->win), e->vboxf);
+ etk_container_remove(e->vboxf);
etk_container_add(ETK_CONTAINER(e->win), e->vbox);
etk_widget_show_all(e->win);
etk_container_add(ETK_CONTAINER(e->hpaned_shadow), e->notebook);
@@ -631,7 +631,7 @@
etk_widget_hide(e->statusbar[2]);
etk_widget_hide(e->statusbar[3]);
etk_widget_hide(e->sort_bar);
- etk_container_remove(ETK_CONTAINER(e->win), e->vbox);
+ etk_container_remove(e->vbox);
e->vboxf = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(e->win), e->vboxf);
etk_box_append(ETK_BOX(e->vboxf), e->notebook,
@@ -804,11 +804,11 @@
e->vpaned = etk_vpaned_new();
etk_paned_child1_set(ETK_PANED(e->hpaned), e->vpaned, ETK_FALSE);
- e->table = etk_table_new(4, 4, ETK_FALSE);
+ e->table = etk_table_new(4, 4, ETK_TABLE_NOT_HOMOGENEOUS);
etk_paned_child1_set(ETK_PANED(e->vpaned), e->table, ETK_TRUE);
e->menu_bar = etk_menu_bar_new();
- etk_table_attach(ETK_TABLE(e->table), e->menu_bar, 0, 4, 0, 0, 0, 0,
ETK_TABLE_FILL | ETK_TABLE_HEXPAND);
+ etk_table_attach(ETK_TABLE(e->table), e->menu_bar, 0, 4, 0, 0,
ETK_TABLE_FILL | ETK_TABLE_HEXPAND, 0, 0);
{
Etk_Widget *menu;
@@ -913,7 +913,7 @@
toolbar = etk_toolbar_new();
etk_table_attach(ETK_TABLE(e->table), toolbar,
0, 3, 1, 1,
- 0, 0, ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ ETK_TABLE_HEXPAND | ETK_TABLE_HFILL, 0, 0);
e->zoom_in[0] = etk_tool_button_new();
e->zoom_in[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"zoom_in");
@@ -940,7 +940,7 @@
etk_toolbar_append(ETK_TOOLBAR(toolbar), e->original[0]);
entry_hbox = etk_hbox_new(ETK_FALSE, 0);
- etk_table_attach(ETK_TABLE(e->table), entry_hbox, 0, 3, 2, 2, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(e->table), entry_hbox, 0, 3, 2, 2,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL, 0, 0);
e->entry[0] = etk_entry_new();
etk_box_append(ETK_BOX(entry_hbox), e->entry[0], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- exhibit_options.c 22 Mar 2007 19:43:19 -0000 1.22
+++ exhibit_options.c 25 Mar 2007 18:38:03 -0000 1.23
@@ -596,29 +596,23 @@
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
- table = etk_table_new(2, 3, ETK_FALSE);
+ table = etk_table_new(2, 3, ETK_TABLE_NOT_HOMOGENEOUS);
etk_box_append(ETK_BOX(vbox2), table, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("Blur thresh");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, ETK_TABLE_NONE, 0, 0);
dialog->blur_thresh = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->blur_thresh, 1, 1, 0, 0, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->blur_thresh, 1, 1, 0, 0,
ETK_TABLE_NONE, 0, 0);
label = etk_label_new("Sharpen thresh");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, ETK_TABLE_NONE, 0, 0);
dialog->sharpen_thresh = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->sharpen_thresh, 1, 1, 1, 1, 0,
0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->sharpen_thresh, 1, 1, 1, 1,
ETK_TABLE_NONE, 0, 0);
label = etk_label_new("Brighten thresh");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2, ETK_TABLE_NONE, 0, 0);
dialog->brighten_thresh = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->brighten_thresh, 1, 1, 2, 2, 0,
0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->brighten_thresh, 1, 1, 2, 2,
ETK_TABLE_NONE, 0, 0);
frame = etk_frame_new("Rotate");
etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
@@ -745,55 +739,41 @@
etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 5);
etk_box_append(ETK_BOX(vbox2), etk_hseparator_new(), ETK_BOX_START,
ETK_BOX_NONE, 5);
- table = etk_table_new(3, 5, ETK_FALSE);
+ table = etk_table_new(3, 5, ETK_TABLE_NOT_HOMOGENEOUS);
etk_box_append(ETK_BOX(vbox2), table, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("Menu display");
- etk_table_attach(ETK_TABLE(table), label, 1, 1, 0, 0, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 1, 1, 0, 0, ETK_TABLE_NONE, 0, 0);
label = etk_label_new("Command");
- etk_table_attach(ETK_TABLE(table), label, 2, 2, 0, 0, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 2, 2, 0, 0, ETK_TABLE_NONE, 0, 0);
label = etk_label_new("Application 1");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 5, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, ETK_TABLE_NONE, 5, 0);
dialog->app1 = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app1, 1, 1, 1, 1, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app1, 1, 1, 1, 1,
ETK_TABLE_NONE, 0, 0);
dialog->app1_cmd = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app1_cmd, 2, 2, 1, 1, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app1_cmd, 2, 2, 1, 1,
ETK_TABLE_NONE, 0, 0);
label = etk_label_new("Application 2");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2, ETK_TABLE_NONE, 0, 0);
dialog->app2 = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app2, 1, 1, 2, 2, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app2, 1, 1, 2, 2,
ETK_TABLE_NONE, 0, 0);
dialog->app2_cmd = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app2_cmd, 2, 2, 2, 2, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app2_cmd, 2, 2, 2, 2,
ETK_TABLE_NONE, 0, 0);
label = etk_label_new("Application 3");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 3, 3, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 3, 3, ETK_TABLE_NONE, 0, 0);
dialog->app3 = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app3, 1, 1, 3, 3, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app3, 1, 1, 3, 3,
ETK_TABLE_NONE, 0, 0);
dialog->app3_cmd = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app3_cmd, 2, 2, 3, 3, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app3_cmd, 2, 2, 3, 3,
ETK_TABLE_NONE, 0, 0);
label = etk_label_new("Application 4");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 4, 4, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 4, 4, ETK_TABLE_NONE, 0, 0);
dialog->app4 = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app4, 1, 1, 4, 4, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app4, 1, 1, 4, 4,
ETK_TABLE_NONE, 0, 0);
dialog->app4_cmd = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), dialog->app4_cmd, 2, 2, 4, 4, 0, 0,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), dialog->app4_cmd, 2, 2, 4, 4,
ETK_TABLE_NONE, 0, 0);
if (e->options->app1)
etk_entry_text_set(ETK_ENTRY(dialog->app1), e->options->app1);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- exhibit_tab.c 22 Mar 2007 19:43:19 -0000 1.37
+++ exhibit_tab.c 25 Mar 2007 18:38:03 -0000 1.38
@@ -146,7 +146,7 @@
etk_table_attach(ETK_TABLE(e->table), tab->dtree,
0, 3, 3, 3,
- 0, 0, ETK_TABLE_VEXPAND | ETK_TABLE_FILL);
+ ETK_TABLE_VEXPAND | ETK_TABLE_FILL, 0, 0);
etk_widget_show(tab->dtree);
etk_paned_child2_set(ETK_PANED(e->vpaned), tab->itree, ETK_TRUE);
@@ -167,8 +167,8 @@
if (e->cur_tab->comment.visible)
{
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->comment.vbox);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_container_remove(e->cur_tab->alignment);
+ etk_container_remove(e->cur_tab->comment.frame);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_BOX_START, ETK_BOX_NONE, 3);
}
@@ -197,8 +197,8 @@
if (e->cur_tab->comment.visible)
{
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->comment.vbox);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_container_remove(e->cur_tab->alignment);
+ etk_container_remove(e->cur_tab->comment.frame);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_BOX_START, ETK_BOX_NONE, 3);
}
@@ -227,8 +227,8 @@
if (e->cur_tab->comment.visible)
{
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->comment.vbox);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->alignment);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_container_remove(e->cur_tab->alignment);
+ etk_container_remove(e->cur_tab->comment.frame);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_BOX_START, ETK_BOX_NONE, 3);
}
@@ -256,8 +256,8 @@
if (e->cur_tab->comment.visible)
{
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook), e->cur_tab->num,
e->cur_tab->comment.vbox);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view);
- etk_container_remove(ETK_CONTAINER(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame);
+ etk_container_remove(e->cur_tab->scrolled_view);
+ etk_container_remove(e->cur_tab->comment.frame);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->alignment, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_BOX_START, ETK_BOX_NONE, 3);
}
@@ -307,7 +307,7 @@
else
row_num = 1;
- table = etk_table_new(EX_DND_COL_NUM, row_num + 1, ETK_TRUE);
+ table = etk_table_new(EX_DND_COL_NUM, row_num + 1,
ETK_TABLE_HOMOGENEOUS);
drag_data = calloc(PATH_MAX * evas_list_count(rows), sizeof(char));
for(ll = rows; ll; ll = ll->next)
{
@@ -322,8 +322,7 @@
image = etk_image_new_from_file(icol1_string, NULL);
etk_image_keep_aspect_set(ETK_IMAGE(image), ETK_TRUE);
etk_widget_size_request_set(image, 48, 48);
- etk_table_attach(ETK_TABLE(table), image, l, r, t, b, 3, 3,
- ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), image, l, r, t, b,
ETK_TABLE_NONE, 3, 3);
++l; ++r;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
