Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/iconbar
Dir : e17/apps/iconbar/src
Modified Files:
iconbar.c iconbar.h iconbar_smart.c
Log Message:
update container
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- iconbar.c 20 Feb 2004 03:23:49 -0000 1.15
+++ iconbar.c 22 Apr 2004 16:45:31 -0000 1.16
@@ -69,9 +69,9 @@
evas_object_resize(ib->cont, 20, 200);
evas_object_show(ib->cont);
if((layout = edje_file_data_get(buf, "container_layout")))
- e_container_layout_plugin_set(ib->cont, layout);
+ esmart_container_layout_plugin_set(ib->cont, layout);
edje_object_part_swallow(ib->gui, "icons", ib->cont); //was clip
- e_container_callback_order_change_set(ib->cont, write_out_order, ib);
+ esmart_container_callback_order_change_set(ib->cont, write_out_order, ib);
edje_object_signal_callback_add(ib->gui, "mouse,*", "*", cb_iconbar, ib);
edje_object_signal_callback_add(ib->gui, "scroll,*", "*", cb_iconbar, ib);
@@ -170,7 +170,7 @@
Icon *ic = evas_list_data(l);
printf("append icon: %s\n", ic->file);
- e_container_element_append(ib->cont, ic->image);
+ esmart_container_element_append(ib->cont, ic->image);
}
evas_list_free(icons);
@@ -188,7 +188,7 @@
if((ib = (Iconbar*)data))
{
- for (l = e_container_elements_get(ib->cont); l; l = l->next)
+ for (l = esmart_container_elements_get(ib->cont); l; l = l->next)
{
Evas_Object *obj = l->data;
Icon *ic = evas_object_data_get(obj, "Icon");
@@ -215,19 +215,19 @@
ib = (Iconbar *)data;
if (!strcmp(sig, "scroll,1,start"))
{
- e_container_scroll_start(ib->cont, -1);
+ esmart_container_scroll_start(ib->cont, -1);
}
else if (!strcmp(sig, "scroll,2,start"))
{
- e_container_scroll_start(ib->cont, 1);
+ esmart_container_scroll_start(ib->cont, 1);
}
else if (!strcmp(sig, "scroll,1,stop"))
{
- e_container_scroll_stop(ib->cont);
+ esmart_container_scroll_stop(ib->cont);
}
else if (!strcmp(sig, "scroll,2,stop"))
{
- e_container_scroll_stop(ib->cont);
+ esmart_container_scroll_stop(ib->cont);
}
if (!strcmp(sig, "mouse,clicked,1"))
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- iconbar.h 20 Feb 2004 03:23:49 -0000 1.4
+++ iconbar.h 22 Apr 2004 16:45:31 -0000 1.5
@@ -4,7 +4,7 @@
#include <Evas.h>
#include <Ecore.h>
#include <Edje.h>
-#include <Esmart/container.h>
+#include <Esmart/Esmart_Container.h>
#include <stdlib.h>
#include <stdio.h>
#include <dirent.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar_smart.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- iconbar_smart.c 20 Feb 2004 03:23:49 -0000 1.1
+++ iconbar_smart.c 22 Apr 2004 16:45:31 -0000 1.2
@@ -63,13 +63,13 @@
evas = evas_object_evas_get(o);
- ib->cont = e_container_new(evas);
- e_container_direction_set(ib->cont, 1);
- e_container_spacing_set(ib->cont, 5);
- e_container_alignment_set(ib->cont, CONTAINER_ALIGN_CENTER);
- e_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X |
+ ib->cont = esmart_container_new(evas);
+ esmart_container_direction_set(ib->cont, 1);
+ esmart_container_spacing_set(ib->cont, 5);
+ esmart_container_alignment_set(ib->cont, CONTAINER_ALIGN_CENTER);
+ esmart_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X |
CONTAINER_FILL_POLICY_KEEP_ASPECT);
- e_container_move_button_set(ib->cont, 2);
+ esmart_container_move_button_set(ib->cont, 2);
}
@@ -83,7 +83,7 @@
/* FIXME free everything up!! */
- for (l = e_container_elements_get(ib->cont); l; l = l->next)
+ for (l = esmart_container_elements_get(ib->cont); l; l = l->next)
{
Icon *ic = evas_object_data_get(l->data, "Icon");
iconbar_icon_free(ic);
@@ -174,17 +174,17 @@
if (w > h)
{
- e_container_direction_set(ib->cont, 0);
- e_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_Y |
+ esmart_container_direction_set(ib->cont, 0);
+ esmart_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_Y |
CONTAINER_FILL_POLICY_KEEP_ASPECT);
- e_container_padding_set(ib->cont, 5, 5, 11, 11);
+ esmart_container_padding_set(ib->cont, 5, 5, 11, 11);
}
else
{
- e_container_direction_set(ib->cont, 1);
- e_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X |
+ esmart_container_direction_set(ib->cont, 1);
+ esmart_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X |
CONTAINER_FILL_POLICY_KEEP_ASPECT);
- e_container_padding_set(ib->cont, 11, 11, 5, 5);
+ esmart_container_padding_set(ib->cont, 11, 11, 5, 5);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
