Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c etk_list_viewer.c etk_trackback.c
layout_etk_simple.c
Log Message:
* ETK box api updates
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_icon_viewer.c 4 Jun 2006 13:09:38 -0000 1.12
+++ etk_icon_viewer.c 16 Aug 2006 01:20:53 -0000 1.13
@@ -358,11 +358,11 @@
}
etk_image_keep_aspect_set(ETK_IMAGE(image), ETK_TRUE);
etk_widget_size_request_set(image, 48, 48);
- etk_box_pack_start(ETK_BOX(vbox), image, ETK_FALSE,
ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), image, ETK_BOX_START,
ETK_BOX_NONE, 0);
- 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);
etk_table_attach(ETK_TABLE(table), vbox, l, r, t, b,
3, 3,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
++l; ++r;
added_object++;
@@ -422,12 +422,12 @@
/*Make the slider*/
viewer->slider = etk_hslider_new(10,128, 48, 1, 1);
- etk_box_pack_start(ETK_BOX(viewer->vbox), viewer->slider, ETK_FALSE,
ETK_FALSE,0);
+ etk_box_append(ETK_BOX(viewer->vbox), viewer->slider, ETK_BOX_START,
ETK_BOX_NONE, 0);
etk_signal_connect("value_changed", ETK_OBJECT(viewer->slider),
ETK_CALLBACK(_entropy_etk_icon_viewer_slider_cb), instance);
viewer->iconbox = etk_iconbox_new();
- etk_box_pack_start(ETK_BOX(viewer->vbox), viewer->iconbox,
ETK_TRUE,ETK_TRUE,0);
+ etk_box_append(ETK_BOX(viewer->vbox), viewer->iconbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- etk_list_viewer.c 18 Jul 2006 14:09:52 -0000 1.68
+++ etk_list_viewer.c 16 Aug 2006 01:20:53 -0000 1.69
@@ -285,13 +285,13 @@
}
etk_image_keep_aspect_set(ETK_IMAGE(image), ETK_TRUE);
etk_widget_size_request_set(image, 48, 48);
- etk_box_pack_start(ETK_BOX(vbox), image, ETK_FALSE, ETK_FALSE,
0);
+ etk_box_append(ETK_BOX(vbox), image, ETK_BOX_START,
ETK_BOX_NONE, 0);
- 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);
etk_table_attach(ETK_TABLE(table), vbox, l, r, t, b, 3, 3,
- ETK_FILL_POLICY_NONE);
+ ETK_TABLE_NONE);
++l; ++r;
added_object++;
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_trackback.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_trackback.c 24 Apr 2006 14:28:26 -0000 1.3
+++ etk_trackback.c 16 Aug 2006 01:20:53 -0000 1.4
@@ -195,7 +195,7 @@
etk_object_data_set(ETK_OBJECT(combo), "COMP", comp);
etk_widget_show_all(combo);
- etk_box_pack_start(ETK_BOX(trackback->hbox), combo,
ETK_FALSE,ETK_FALSE,0);
+ etk_box_append(ETK_BOX(trackback->hbox), combo,
ETK_BOX_START, ETK_BOX_NONE, 0);
ecore_list_prepend(trackback->levels, combo);
@@ -226,8 +226,8 @@
etk_signal_connect("pressed", ETK_OBJECT(button),
ETK_CALLBACK(_entropy_etk_trackback_up_cb), instance);
trackback->label = etk_label_new("");
- etk_box_pack_start(ETK_BOX(trackback->hbox), button, ETK_FALSE,ETK_FALSE,0);
- etk_box_pack_start(ETK_BOX(trackback->hbox), trackback->label,
ETK_FALSE,ETK_FALSE,0);
+ etk_box_append(ETK_BOX(trackback->hbox), button, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(trackback->hbox), trackback->label, ETK_BOX_START,
ETK_BOX_NONE, 0);
instance->gui_object = trackback->hbox;
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- layout_etk_simple.c 6 Aug 2006 05:33:50 -0000 1.54
+++ layout_etk_simple.c 16 Aug 2006 01:20:53 -0000 1.55
@@ -336,7 +336,7 @@
} else {
printf("No current folder!\n");
}
- etk_box_pack_start(ETK_BOX(gui->localshell), local->gui_object,
ETK_TRUE,ETK_TRUE,0);
+ etk_box_append(ETK_BOX(gui->localshell), local->gui_object,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
} else {
printf("Selected instance has no GUI_OBJECT\n");
}
@@ -671,7 +671,7 @@
instance = (*local_plugin_init)(core, layout,NULL);
instance->plugin = local;
gui->list_viewer = instance;
- etk_box_pack_start(ETK_BOX(gui->localshell), instance->gui_object,
ETK_TRUE,ETK_TRUE,0);
+ etk_box_append(ETK_BOX(gui->localshell), instance->gui_object,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
}
/*Initialise the icon viewer*/
@@ -683,7 +683,6 @@
gui->iconbox_viewer = (*local_plugin_init)(core, layout,NULL);
gui->iconbox_viewer->plugin = local;
gui->iconbox_viewer->active=0;
- //etk_box_pack_start(ETK_BOX(gui->localshell), instance->gui_object,
ETK_TRUE,ETK_TRUE,0);
}
@@ -782,29 +781,29 @@
_entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("About.."),
ETK_STOCK_HELP_BROWSER, ETK_MENU_SHELL(menu), NULL);
- etk_box_pack_start(ETK_BOX(vbox), menubar, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), menubar, ETK_BOX_START, ETK_BOX_NONE, 0);
if (trackback) {
- etk_box_pack_start(ETK_BOX(vbox), gui->trackback->gui_object,
ETK_FALSE,ETK_FALSE,0);
+ etk_box_append(ETK_BOX(vbox), gui->trackback->gui_object,
ETK_BOX_START, ETK_BOX_NONE, 0);
}
- etk_box_pack_start(ETK_BOX(vbox), gui->paned, TRUE, TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), gui->paned, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
/*---------------------------*/
gui->statusbar_box = etk_hbox_new(ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(vbox), gui->statusbar_box, ETK_FALSE, ETK_FALSE,
0);
+ etk_box_append(ETK_BOX(vbox), gui->statusbar_box, ETK_BOX_START,
ETK_BOX_NONE, 0);
gui->statusbars[0] = etk_statusbar_new();
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(gui->statusbars[0]),
ETK_FALSE);
- etk_box_pack_start(ETK_BOX(gui->statusbar_box), gui->statusbars[0],
ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(gui->statusbar_box), gui->statusbars[0],
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
gui->statusbars[1] = etk_statusbar_new();
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(gui->statusbars[1]),
ETK_FALSE);
- etk_box_pack_start(ETK_BOX(gui->statusbar_box), gui->statusbars[1],
ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(gui->statusbar_box), gui->statusbars[1],
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
gui->statusbars[2] = etk_statusbar_new();
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(gui->statusbars[2]),
ETK_TRUE);
- etk_box_pack_start(ETK_BOX(gui->statusbar_box), gui->statusbars[2],
ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(gui->statusbar_box), gui->statusbars[2],
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_widget_show_all (window);
-------------------------------------------------------------------------
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
