Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis_callbacks.c emphasis_config_gui.c
Log Message:
new box api.
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emphasis_callbacks.c 21 Jul 2006 04:05:27 -0000 1.7
+++ emphasis_callbacks.c 15 Aug 2006 18:31:45 -0000 1.8
@@ -836,9 +836,9 @@
etk_widget_hide_all(player->media.window);
etk_container_remove(ETK_CONTAINER(player->media.window),
player->media.root);
- etk_box_pack_start(ETK_BOX(player->full.root),
+ etk_box_append(ETK_BOX(player->full.root),
player->media.root,
- ETK_TRUE, ETK_TRUE, 0);
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
emphasis_player_toggle_full(player, ETK_TRUE);
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_config_gui.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emphasis_config_gui.c 21 Jul 2006 04:05:27 -0000 1.1
+++ emphasis_config_gui.c 15 Aug 2006 18:31:45 -0000 1.2
@@ -17,8 +17,8 @@
etk_container_add(ETK_CONTAINER(gui->window), gui->vbox);
gui->connection_frame = etk_frame_new("Connection settings");
- etk_box_pack_start(ETK_BOX(gui->vbox), gui->connection_frame,
- ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(gui->vbox), gui->connection_frame,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
gui->connection_vbox = etk_vbox_new(ETK_TRUE, 5);
etk_container_add(ETK_CONTAINER(gui->connection_frame),
gui->connection_vbox);
@@ -26,38 +26,38 @@
gui->hostname_hbox = etk_hbox_new(ETK_TRUE, 0);
gui->hostname_label = etk_label_new("Hostname :");
gui->hostname_entry = etk_entry_new();
- etk_box_pack_start(ETK_BOX(gui->hostname_hbox), gui->hostname_label,
- ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(gui->hostname_hbox), gui->hostname_entry,
- ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(gui->connection_vbox), gui->hostname_hbox,
- ETK_TRUE, ETK_TRUE, 5);
+ etk_box_append(ETK_BOX(gui->hostname_hbox), gui->hostname_label,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(gui->hostname_hbox), gui->hostname_entry,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(gui->connection_vbox), gui->hostname_hbox,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
gui->port_hbox = etk_hbox_new(ETK_TRUE, 0);
gui->port_label = etk_label_new("Port :");
// gui->port_spin = etk_spin_button_new(0, 65536, 1);
- etk_box_pack_start(ETK_BOX(gui->port_hbox), gui->port_label,
- ETK_TRUE, ETK_TRUE, 0);
-/* etk_box_pack_start(ETK_BOX(gui->port_hbox), gui->port_spin,
- ETK_TRUE, ETK_TRUE, 0);*/
- etk_box_pack_start(ETK_BOX(gui->connection_vbox), gui->port_hbox,
- ETK_TRUE, ETK_TRUE, 5);
+ etk_box_append(ETK_BOX(gui->port_hbox), gui->port_label,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+/* etk_box_append(ETK_BOX(gui->port_hbox), gui->port_spin,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); */
+ etk_box_append(ETK_BOX(gui->connection_vbox), gui->port_hbox,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
gui->password_hbox = etk_hbox_new(ETK_TRUE, 0);
gui->password_label = etk_label_new("password :");
gui->password_entry = etk_entry_new();
etk_entry_password_set(ETK_ENTRY(gui->password_entry), ETK_TRUE);
- etk_box_pack_start(ETK_BOX(gui->password_hbox), gui->password_label,
- ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(gui->password_hbox), gui->password_entry,
- ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(gui->connection_vbox), gui->password_hbox,
- ETK_TRUE, ETK_TRUE, 5);
+ etk_box_append(ETK_BOX(gui->password_hbox), gui->password_label,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(gui->password_hbox), gui->password_entry,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(gui->connection_vbox), gui->password_hbox,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
/**/
gui->interface_frame = etk_frame_new("Interface settings");
- etk_box_pack_start(ETK_BOX(gui->vbox), gui->interface_frame,
- ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(gui->vbox), gui->interface_frame,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
gui->interface_vbox = etk_vbox_new(ETK_TRUE, 5);
etk_container_add(ETK_CONTAINER(gui->interface_frame), gui->interface_vbox);
@@ -65,25 +65,25 @@
gui->rowheight_hbox = etk_hbox_new(ETK_TRUE, 0);
gui->rowheight_label = etk_label_new("Row Height :");
// gui->rowheight_spin = etk_spin_button_new(0, 50, 1);
- etk_box_pack_start(ETK_BOX(gui->rowheight_hbox), gui->rowheight_label,
- ETK_TRUE, ETK_TRUE, 0);
-/* etk_box_pack_start(ETK_BOX(gui->rowheight_hbox), gui->rowheight_spin,
- ETK_TRUE, ETK_TRUE, 0); */
- etk_box_pack_start(ETK_BOX(gui->interface_vbox), gui->rowheight_hbox,
- ETK_TRUE, ETK_TRUE, 5);
+ etk_box_append(ETK_BOX(gui->rowheight_hbox), gui->rowheight_label,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+/* etk_box_append(ETK_BOX(gui->rowheight_hbox), gui->rowheight_spin,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); */
+ etk_box_append(ETK_BOX(gui->interface_vbox), gui->rowheight_hbox,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
/**/
gui->buttons_box_hbox = etk_hbox_new(ETK_TRUE, 5);
gui->buttons_box_ok = etk_button_new_with_label("Ok");
gui->buttons_box_apply = etk_button_new_with_label("Apply");
gui->buttons_box_cancel = etk_button_new_with_label("Cancel");
- etk_box_pack_start(ETK_BOX(gui->buttons_box_hbox), gui->buttons_box_ok,
- ETK_TRUE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(gui->buttons_box_hbox), gui->buttons_box_apply,
- ETK_TRUE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(gui->buttons_box_hbox), gui->buttons_box_cancel,
- ETK_TRUE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(gui->vbox), gui->buttons_box_hbox,
- ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(gui->buttons_box_hbox), gui->buttons_box_ok,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(gui->buttons_box_hbox), gui->buttons_box_apply,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(gui->buttons_box_hbox), gui->buttons_box_cancel,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(gui->vbox), gui->buttons_box_hbox,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
return gui;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
