Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_comment.c exhibit_image.c exhibit_main.c
exhibit_menus.c exhibit_options.c exhibit_tab.c
Log Message:
Fix exhibit
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_comment.c 11 Aug 2006 02:30:57 -0000 1.10
+++ exhibit_comment.c 15 Aug 2006 18:45:51 -0000 1.11
@@ -22,12 +22,12 @@
}
if (e->cur_tab->fit_window)
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->alignment, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(e->cur_tab->comment.vbox), e->cur_tab->alignment,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
else
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
e->cur_tab->comment.frame = etk_frame_new(_("Image Comments"));
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ etk_box_append(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_BOX_START, ETK_BOX_NONE, 3);
e->cur_tab->comment.textview = etk_text_view_new();
etk_widget_size_request_set(e->cur_tab->comment.textview, -1, 50);
@@ -41,11 +41,11 @@
etk_container_add(ETK_CONTAINER(e->cur_tab->comment.frame),
e->cur_tab->comment.vbox2);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox2),
e->cur_tab->comment.textview, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox2),
e->cur_tab->comment.hbox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(e->cur_tab->comment.vbox2),
e->cur_tab->comment.textview, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(e->cur_tab->comment.vbox2),
e->cur_tab->comment.hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.hbox),
e->cur_tab->comment.revert, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.hbox),
e->cur_tab->comment.save, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(e->cur_tab->comment.hbox),
e->cur_tab->comment.revert, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(e->cur_tab->comment.hbox), e->cur_tab->comment.save,
ETK_BOX_START, ETK_BOX_NONE, 0);
e->cur_tab->comment.visible = ETK_TRUE;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- exhibit_image.c 13 Aug 2006 22:59:01 -0000 1.32
+++ exhibit_image.c 15 Aug 2006 18:45:51 -0000 1.33
@@ -634,13 +634,13 @@
etk_container_add(ETK_CONTAINER(vbox), fd->filechooser);
label = etk_label_new("Filename:");
- etk_box_pack_start(ETK_BOX(vbox), label, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
D(("Selected original filename: %s\n", e->cur_tab->cur_file));
fd->entry = etk_entry_new();
etk_entry_text_set(ETK_ENTRY(fd->entry), e->cur_tab->cur_file);
- etk_box_pack_start(ETK_BOX(vbox), fd->entry, ETK_TRUE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), fd->entry, ETK_BOX_START, ETK_BOX_EXPAND, 0);
etk_signal_connect("key_down", ETK_OBJECT(fd->entry),
ETK_CALLBACK(_ex_image_save_as_entry_cb), fd);
@@ -648,12 +648,12 @@
etk_container_add(ETK_CONTAINER(vbox), hbox);
btn = etk_button_new_with_label("Save");
- etk_box_pack_start(ETK_BOX(hbox), btn, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect_swapped("clicked", ETK_OBJECT(btn),
ETK_CALLBACK(_ex_image_save_as_cb), fd);
btn = etk_button_new_with_label("Cancel");
- etk_box_pack_start(ETK_BOX(hbox), btn, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect_swapped("clicked", ETK_OBJECT(btn),
ETK_CALLBACK(etk_widget_hide), fd->win);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- exhibit_main.c 13 Aug 2006 22:59:01 -0000 1.65
+++ exhibit_main.c 15 Aug 2006 18:45:51 -0000 1.66
@@ -657,7 +657,7 @@
e->hpaned = etk_hpaned_new();
//etk_container_add(ETK_CONTAINER(e->win), e->hpaned);
- etk_box_pack_start(ETK_BOX(e->vbox), e->hpaned, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(e->vbox), e->hpaned, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
e->vpaned = etk_vpaned_new();
etk_paned_child1_set(ETK_PANED(e->hpaned), e->vpaned, ETK_FALSE);
@@ -666,7 +666,7 @@
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_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND);
+ etk_table_attach(ETK_TABLE(e->table), e->menu_bar, 0, 4, 0, 0, 0, 0,
ETK_TABLE_FILL | ETK_TABLE_HEXPAND);
{
Etk_Widget *menu;
@@ -777,7 +777,7 @@
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->zoom_in[0]),
ETK_CALLBACK(_ex_tab_current_zoom_in), e);
etk_table_attach(ETK_TABLE(e->table), e->zoom_in[0],
0, 0, 1, 1,
- 0, 0, ETK_FILL_POLICY_NONE);
+ 0, 0, ETK_TABLE_NONE);
e->zoom_out[0] = etk_button_new();
e->zoom_out[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "zoom_out");
@@ -785,7 +785,7 @@
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->zoom_out[0]),
ETK_CALLBACK(_ex_tab_current_zoom_out), e);
etk_table_attach(ETK_TABLE(e->table), e->zoom_out[0],
1, 1, 1, 1,
- 0, 0, ETK_FILL_POLICY_NONE);
+ 0, 0, ETK_TABLE_NONE);
e->fit[0] = etk_button_new();
e->fit[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj",
"fit_to_window");
@@ -793,7 +793,7 @@
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->fit[0]),
ETK_CALLBACK(_ex_tab_current_fit_to_window), e);
etk_table_attach(ETK_TABLE(e->table), e->fit[0],
2, 2, 1, 1,
- 0, 0, ETK_FILL_POLICY_NONE);
+ 0, 0, ETK_TABLE_NONE);
e->original[0] = etk_button_new();
e->original[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "one_to_one");
@@ -801,16 +801,16 @@
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->original[0]),
ETK_CALLBACK(_ex_tab_current_zoom_one_to_one), e);
etk_table_attach(ETK_TABLE(e->table), e->original[0],
3, 3, 1, 1,
- 0, 0, ETK_FILL_POLICY_NONE);
+ 0, 0, ETK_TABLE_NONE);
e->entry[0] = etk_entry_new();
- etk_table_attach(ETK_TABLE(e->table), e->entry[0], 0, 2, 2, 2, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
+ etk_table_attach(ETK_TABLE(e->table), e->entry[0], 0, 2, 2, 2, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
etk_signal_connect("key_down", ETK_OBJECT(e->entry[0]),
ETK_CALLBACK(_ex_main_entry_dir_key_down_cb), e);
e->entry[1] = etk_button_new_with_label("Go");
etk_table_attach(ETK_TABLE(e->table), e->entry[1],
3, 3, 2, 2,
- 0, 0, ETK_FILL_POLICY_NONE);
+ 0, 0, ETK_TABLE_NONE);
etk_signal_connect("clicked", ETK_OBJECT(e->entry[1]),
ETK_CALLBACK(_ex_main_goto_dir_clicked_cb), e);
/* create first tab but dont place it in notebook */
@@ -842,11 +842,11 @@
_ex_main_populate_files(e, file);
e->hbox = etk_hbox_new(ETK_TRUE, 0);
- etk_box_pack_end(ETK_BOX(e->vbox), e->hbox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(e->vbox), e->hbox, ETK_BOX_END, ETK_BOX_NONE, 0);
e->sort = etk_label_new("Sort by date");
/* size is different than statusbar, how do we make it look good? */
- //etk_box_pack_start(ETK_BOX(e->hbox), e->sort, ETK_TRUE, ETK_TRUE, 0);
+ //etk_box_append(ETK_BOX(e->hbox), e->sort, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
{
Etk_Widget *menu;
Etk_Widget *menu_item;
@@ -863,15 +863,15 @@
e->statusbar[0] = etk_statusbar_new();
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e->statusbar[0]),
ETK_FALSE);
- etk_box_pack_start(ETK_BOX(e->hbox), e->statusbar[0], ETK_TRUE, ETK_TRUE,
0);
+ etk_box_append(ETK_BOX(e->hbox), e->statusbar[0], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
e->statusbar[1] = etk_statusbar_new();
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e->statusbar[1]),
ETK_FALSE);
- etk_box_pack_start(ETK_BOX(e->hbox), e->statusbar[1], ETK_TRUE, ETK_TRUE,
0);
+ etk_box_append(ETK_BOX(e->hbox), e->statusbar[1], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
e->statusbar[2] = etk_statusbar_new();
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e->statusbar[2]),
ETK_FALSE);
- etk_box_pack_start(ETK_BOX(e->hbox), e->statusbar[2], ETK_TRUE, ETK_TRUE,
0);
+ etk_box_append(ETK_BOX(e->hbox), e->statusbar[2], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
if (e->options->default_view == EX_IMAGE_ONE_TO_ONE)
etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
@@ -879,7 +879,7 @@
etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), "Fit to window", 0);
e->statusbar[3] = etk_statusbar_new();
- etk_box_pack_start(ETK_BOX(e->hbox), e->statusbar[3], ETK_TRUE, ETK_TRUE,
0);
+ etk_box_append(ETK_BOX(e->hbox), e->statusbar[3], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_widget_show_all(e->win);
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- exhibit_menus.c 13 Aug 2006 22:59:01 -0000 1.28
+++ exhibit_menus.c 15 Aug 2006 18:45:51 -0000 1.29
@@ -557,7 +557,7 @@
"</style></p>",
ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), desctext);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
frame = etk_frame_new("Authors");
abouttext = etk_text_view_new();
@@ -571,7 +571,7 @@
"Simon '<b>MoOm</b>' Treny",
ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), abouttext);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
frame = etk_frame_new("Common shortcuts");
helptext = etk_text_view_new();
@@ -587,7 +587,7 @@
"<b>control-s:</b> toggle slideshow\n",
ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), helptext);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_dialog_pack_in_main_area(ETK_DIALOG(win), vbox, ETK_FALSE, ETK_FALSE,
0, ETK_FALSE);
etk_dialog_button_add(ETK_DIALOG(win), "Close", ETK_RESPONSE_CLOSE);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- exhibit_options.c 13 Aug 2006 22:59:01 -0000 1.13
+++ exhibit_options.c 15 Aug 2006 18:45:51 -0000 1.14
@@ -506,36 +506,36 @@
vbox = etk_vbox_new(ETK_FALSE, 3);
frame = etk_frame_new("Choose standard view");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
dialog->dv_btn_1 = etk_radio_button_new_with_label("Zoom 1:1", NULL);
- etk_box_pack_start(ETK_BOX(vbox2), dialog->dv_btn_1, ETK_FALSE, ETK_FALSE,
0);
+ etk_box_append(ETK_BOX(vbox2), dialog->dv_btn_1, ETK_BOX_START,
ETK_BOX_NONE, 0);
dialog->dv_btn_2 = etk_radio_button_new_with_label_from_widget("Fit to
window",
ETK_RADIO_BUTTON(dialog->dv_btn_1));
- etk_box_pack_start(ETK_BOX(vbox2), dialog->dv_btn_2, ETK_FALSE, ETK_FALSE,
0);
+ etk_box_append(ETK_BOX(vbox2), dialog->dv_btn_2, ETK_BOX_START,
ETK_BOX_NONE, 0);
frame = etk_frame_new("Slideshow");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), hbox);
label = etk_label_new("Interval");
- etk_box_pack_start(ETK_BOX(hbox), label, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
dialog->slide_interval = etk_entry_new();
- etk_box_pack_start(ETK_BOX(hbox), dialog->slide_interval, ETK_FALSE,
ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), dialog->slide_interval, ETK_BOX_START,
ETK_BOX_NONE, 0);
frame = etk_frame_new("Comments");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
dialog->comments_visible = etk_check_button_new_with_label("Visible");
- etk_box_pack_start(ETK_BOX(vbox2), dialog->comments_visible, ETK_FALSE,
ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), dialog->comments_visible, ETK_BOX_START,
ETK_BOX_NONE, 0);
/*
* Start toggling/setting the correct values from loaded options
@@ -568,42 +568,42 @@
vbox = etk_vbox_new(ETK_FALSE, 3);
frame = etk_frame_new("Effect thresh");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
table = etk_table_new(2, 3, ETK_FALSE);
- etk_box_pack_start(ETK_BOX(vbox2), table, ETK_FALSE, ETK_FALSE, 0);
+ 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_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->blur_thresh = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->blur_thresh, 1, 1, 0, 0, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
label = etk_label_new("Sharpen thresh");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->sharpen_thresh = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->sharpen_thresh, 1, 1, 1, 1, 0,
0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
label = etk_label_new("Brighten thresh");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->brighten_thresh = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->brighten_thresh, 1, 1, 2, 2, 0,
0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
frame = etk_frame_new("Rotate");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
dialog->rotate_autosave = etk_check_button_new_with_label("Autosave after
rotate");
- etk_box_pack_start(ETK_BOX(vbox2), dialog->rotate_autosave, ETK_FALSE,
- ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), dialog->rotate_autosave, ETK_BOX_START,
+ ETK_BOX_NONE, 0);
sprintf(string, "%.2f", e->options->blur_thresh);
@@ -656,13 +656,13 @@
vbox = etk_vbox_new(ETK_FALSE, 3);
frame = etk_frame_new("Thumb sorting");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), hbox);
label = etk_label_new("Default sort by");
- etk_box_pack_start(ETK_BOX(hbox), label, ETK_FALSE,
- ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START,
+ ETK_BOX_NONE, 0);
e->options->default_sort_tmp = e->options->default_sort;
@@ -672,8 +672,8 @@
etk_combobox_column_add(ETK_COMBOBOX(dialog->default_sort),
ETK_COMBOBOX_LABEL,
75, ETK_TRUE, ETK_FALSE, ETK_FALSE, 0.0, 0.5);
etk_combobox_build(ETK_COMBOBOX(dialog->default_sort));
- etk_box_pack_start(ETK_BOX(hbox), dialog->default_sort, ETK_FALSE,
- ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), dialog->default_sort, ETK_BOX_START,
+ ETK_BOX_NONE, 0);
image = etk_image_new_from_stock(ETK_STOCK_OFFICE_CALENDAR,
ETK_STOCK_SMALL);
dialog->sort_date =
etk_combobox_item_append(ETK_COMBOBOX(dialog->default_sort), image, "Date");
@@ -711,63 +711,63 @@
vbox = etk_vbox_new(ETK_FALSE, 3);
frame = etk_frame_new("Run in ...");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 5);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
label = etk_label_new("Hint: application command has %s as file
argument.");
- etk_box_pack_start(ETK_BOX(vbox2), label, ETK_FALSE, ETK_FALSE, 5);
- etk_box_pack_start(ETK_BOX(vbox2), etk_hseparator_new(), ETK_FALSE,
ETK_FALSE, 5);
+ 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);
- etk_box_pack_start(ETK_BOX(vbox2), table, ETK_FALSE, ETK_FALSE, 0);
+ 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_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
label = etk_label_new("Command");
etk_table_attach(ETK_TABLE(table), label, 2, 2, 0, 0, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
label = etk_label_new("Application 1");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 5, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app1 = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app1, 1, 1, 1, 1, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app1_cmd = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app1_cmd, 2, 2, 1, 1, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
label = etk_label_new("Application 2");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app2 = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app2, 1, 1, 2, 2, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app2_cmd = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app2_cmd, 2, 2, 2, 2, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
label = etk_label_new("Application 3");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 3, 3, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app3 = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app3, 1, 1, 3, 3, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app3_cmd = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app3_cmd, 2, 2, 3, 3, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
label = etk_label_new("Application 4");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 4, 4, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app4 = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app4, 1, 1, 4, 4, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
dialog->app4_cmd = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog->app4_cmd, 2, 2, 4, 4, 0, 0,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
if (e->options->app1)
etk_entry_text_set(ETK_ENTRY(dialog->app1), e->options->app1);
@@ -817,7 +817,7 @@
etk_container_add(ETK_CONTAINER(win), vbox);
notebook = etk_notebook_new();
- etk_box_pack_start(ETK_BOX(vbox), notebook, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), notebook, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
page = _ex_options_page_1_create();
etk_notebook_page_append(ETK_NOTEBOOK(notebook), "General", page);
@@ -828,25 +828,25 @@
page = _ex_options_page_4_create();
etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Exec commands", page);
- etk_box_pack_start(ETK_BOX(vbox), etk_hseparator_new(),
- ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), etk_hseparator_new(),
+ ETK_BOX_START, ETK_BOX_NONE, 5);
hbox = etk_hbox_new(ETK_FALSE, 3);
- etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
button = etk_button_new_from_stock(ETK_STOCK_DIALOG_OK);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_ex_options_set_ok_cb), win);
button = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
etk_button_label_set(ETK_BUTTON(button), "Apply");
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_ex_options_set_apply_cb), NULL);
button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CANCEL);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_ex_options_set_cancel_cb), win);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- exhibit_tab.c 11 Aug 2006 02:30:57 -0000 1.23
+++ exhibit_tab.c 15 Aug 2006 18:45:51 -0000 1.24
@@ -113,7 +113,7 @@
etk_table_attach(ETK_TABLE(tab->e->table), tab->dtree,
0, 3, 3, 3,
- 0, 0,
ETK_FILL_POLICY_VEXPAND|ETK_FILL_POLICY_VFILL|ETK_FILL_POLICY_HFILL);
+ 0, 0, ETK_TABLE_VEXPAND | ETK_TABLE_FILL);
etk_widget_show(tab->dtree);
etk_paned_child2_set(ETK_PANED(tab->e->vpaned), tab->itree, ETK_TRUE);
@@ -138,8 +138,8 @@
etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->scrolled_view, ETK_TRUE);
@@ -151,8 +151,8 @@
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
@@ -184,8 +184,8 @@
etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->scrolled_view, ETK_TRUE);
@@ -197,8 +197,8 @@
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
@@ -230,8 +230,8 @@
etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->scrolled_view, ETK_TRUE);
@@ -243,8 +243,8 @@
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->scrolled_view, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
@@ -274,8 +274,8 @@
etk_paned_child2_set(ETK_PANED(e->hpaned),
e->cur_tab->comment.vbox, ETK_TRUE);
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->alignment, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_paned_child2_set(ETK_PANED(e->hpaned), e->cur_tab->alignment,
ETK_TRUE);
@@ -287,8 +287,8 @@
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_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->alignment, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(e->cur_tab->comment.vbox),
e->cur_tab->comment.frame, ETK_FALSE, ETK_FALSE, 3);
+ 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);
}
else
etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->alignment);
@@ -351,7 +351,7 @@
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_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
++l; ++r;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
