Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_edit.c entrance_session.c main.c
Log Message:
update to new container api
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_edit.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- entrance_edit.c 28 Mar 2004 03:57:01 -0000 1.4
+++ entrance_edit.c 22 Apr 2004 16:52:20 -0000 1.5
@@ -10,7 +10,7 @@
#include <getopt.h>
#include <string.h>
#include <Edje.h>
-#include <Esmart/container.h>
+#include <Esmart/Esmart_Container.h>
#include "entrance.h"
#include "entrance_config.h"
#include "entrance_x_session.h"
@@ -274,7 +274,7 @@
ecco.current_session->name,
ecco.current_session);
- e_container_empty(ecco.container.sessions);
+ esmart_container_empty(ecco.container.sessions);
edje_object_signal_emit(ecco.edje, "ecco,show,sessions",
"");
ecco.hashes =
@@ -323,7 +323,7 @@
ecco.current_user->name,
ecco.current_user);
- e_container_empty(ecco.container.users);
+ esmart_container_empty(ecco.container.users);
edje_object_signal_emit(ecco.edje, "ecco,show,users",
"");
ecco.hashes =
@@ -546,7 +546,7 @@
{
session_item_unselected_cb(ecco.current_session, NULL, "", "");
- if ((l = e_container_elements_get(ecco.container.users)) == NULL)
+ if ((l = esmart_container_elements_get(ecco.container.users)) == NULL)
{
ecco_users_list_init(ecco.container.users);
}
@@ -567,23 +567,23 @@
edje_object_part_drag_value_get(o, str, &dx, &dy);
oo = ecco.container.users;
evas_object_geometry_get(oo, &cx, &cy, &cw, &ch);
- if (e_container_direction_get(oo) > 0)
+ if (esmart_container_direction_get(oo) > 0)
{
- scroll = (int) (dy * (e_container_elements_length_get(oo) - ch));
+ scroll = (int) (dy * (esmart_container_elements_length_get(oo) - ch));
}
else
{
- scroll = (int) (dx * (e_container_elements_length_get(oo) - cw));
+ scroll = (int) (dx * (esmart_container_elements_length_get(oo) - cw));
}
#if DEBUG
- fprintf(stderr, "%d %d\n", scroll, e_container_scroll_offset_get(oo));
+ fprintf(stderr, "%d %d\n", scroll, esmart_container_scroll_offset_get(oo));
#endif
- e_container_scroll_offset_set(oo, -scroll);
+ esmart_container_scroll_offset_set(oo, -scroll);
}
else if (!strcmp(emission, "ecco,show,sessions"))
{
user_unselected_cb(ecco.current_user, NULL, "", "");
- if ((l = e_container_elements_get(ecco.container.sessions)) == NULL)
+ if ((l = esmart_container_elements_get(ecco.container.sessions)) == NULL)
{
ecco_sessions_list_init(ecco.container.sessions);
}
@@ -601,18 +601,18 @@
edje_object_part_drag_value_get(o, str, &dx, &dy);
oo = ecco.container.sessions;
evas_object_geometry_get(oo, &cx, &cy, &cw, &ch);
- if (e_container_direction_get(oo) > 0)
+ if (esmart_container_direction_get(oo) > 0)
{
- scroll = (int) (dy * (e_container_elements_length_get(oo) - ch));
+ scroll = (int) (dy * (esmart_container_elements_length_get(oo) - ch));
}
else
{
- scroll = (int) (dx * (e_container_elements_length_get(oo) - cw));
+ scroll = (int) (dx * (esmart_container_elements_length_get(oo) - cw));
}
#if DEBUG
- fprintf(stderr, "%d %d\n", scroll, e_container_scroll_offset_get(oo));
+ fprintf(stderr, "%d %d\n", scroll, esmart_container_scroll_offset_get(oo));
#endif
- e_container_scroll_offset_set(oo, -scroll);
+ esmart_container_scroll_offset_set(oo, -scroll);
}
#if DEBUG
fprintf(stderr, "Show: (%s)(%s)\n", emission, source);
@@ -830,7 +830,7 @@
ecco.config->theme);
if ((oo = entrance_user_edje_get(eu, ecco.edje, buf)))
{
- e_container_element_append(ecco.container.users, oo);
+ esmart_container_element_append(ecco.container.users, oo);
ecco.config->users.hash =
evas_hash_add(ecco.config->users.hash, eu->name, eu);
ecco.config->users.keys =
@@ -875,7 +875,7 @@
entrance_user_free(eu);
ecco.current_user = NULL;
- e_container_empty(ecco.container.users);
+ esmart_container_empty(ecco.container.users);
edje_object_signal_emit(ecco.edje, "ecco,show,users", "");
}
ecco.config->users.hash = hash;
@@ -896,7 +896,7 @@
entrance_x_session_free(exs);
ecco.current_session = NULL;
- e_container_empty(ecco.container.sessions);
+ esmart_container_empty(ecco.container.sessions);
edje_object_signal_emit(ecco.edje, "ecco,show,sessions", "");
}
}
@@ -1015,18 +1015,18 @@
return;
}
evas_object_geometry_get(oo, &cx, &cy, &cw, &ch);
- if (e_container_direction_get(oo) > 0)
+ if (esmart_container_direction_get(oo) > 0)
{
- scroll = (int) (dy * (e_container_elements_length_get(oo) - ch));
+ scroll = (int) (dy * (esmart_container_elements_length_get(oo) - ch));
}
else
{
- scroll = (int) (dx * (e_container_elements_length_get(oo) - cw));
+ scroll = (int) (dx * (esmart_container_elements_length_get(oo) - cw));
}
#if DEBUG
- fprintf(stderr, "%0.02f %d\n", scroll, e_container_scroll_offset_get(oo));
+ fprintf(stderr, "%0.02f %d\n", scroll, esmart_container_scroll_offset_get(oo));
#endif
- e_container_scroll_offset_set(oo, -scroll);
+ esmart_container_scroll_offset_set(oo, -scroll);
}
/**
@@ -1052,9 +1052,9 @@
{
fprintf(stderr, "%s\n", tmp);
if (!strcmp(tmp + 1, "start"))
- e_container_scroll_start(oo, -1);
+ esmart_container_scroll_start(oo, -1);
else
- e_container_scroll_stop(oo);
+ esmart_container_scroll_stop(oo);
}
}
}
@@ -1086,9 +1086,9 @@
{
fprintf(stderr, "%s\n", tmp);
if (!strcmp(tmp + 1, "start"))
- e_container_scroll_start(oo, 1);
+ esmart_container_scroll_start(oo, 1);
else
- e_container_scroll_stop(oo);
+ esmart_container_scroll_stop(oo);
}
}
}
@@ -1452,8 +1452,8 @@
if ((file = (char *) data))
{
- e_container_empty(ecco.container.users);
- e_container_empty(ecco.container.sessions);
+ esmart_container_empty(ecco.container.users);
+ esmart_container_empty(ecco.container.sessions);
if ((str = evas_hash_find(ecco.hashes, sig)))
{
if ((cstr = evas_hash_find(ecco.hashes, str)))
@@ -1503,7 +1503,7 @@
else
evas_object_resize(o, 50, 50);
evas_object_show(o);
- e_container_element_append(container, o);
+ esmart_container_element_append(container, o);
edje_object_signal_callback_add(o, "PreviewSelected", "*",
_preview_selected,
strdup(di->d_name));
@@ -1541,7 +1541,7 @@
if ((eu = evas_hash_find(ecco.config->users.hash, str)))
{
if ((o = entrance_user_edje_get(eu, ecco.edje, buf)))
- e_container_element_append(container, o);
+ esmart_container_element_append(container, o);
}
}
}
@@ -1574,7 +1574,7 @@
{
if ((o = entrance_x_session_edje_get(exs, container, buf)))
{
- e_container_element_append(container, o);
+ esmart_container_element_append(container, o);
}
}
}
@@ -1809,18 +1809,18 @@
snprintf(buf, PATH_MAX, "ecco,container,scroll,next,%s,stop",
containers[i]);
ecco.hashes = evas_hash_add(ecco.hashes, buf, str);
- if ((oo = e_container_new(evas_object_evas_get(o))))
+ if ((oo = esmart_container_new(evas_object_evas_get(o))))
{
#if 0
- e_container_layout_plugin_set(oo, "entice");
+ esmart_container_layout_plugin_set(oo, "entice");
#endif
evas_object_layer_set(oo, 0);
edje_object_part_geometry_get(o, str, NULL, NULL, &cw, &ch);
- e_container_fill_policy_set(oo,
+ esmart_container_fill_policy_set(oo,
CONTAINER_FILL_POLICY_KEEP_ASPECT |
CONTAINER_FILL_POLICY_HOMOGENOUS);
- e_container_padding_set(oo, 0, 0, 0, 0);
- e_container_spacing_set(oo, 4);
+ esmart_container_padding_set(oo, 0, 0, 0, 0);
+ esmart_container_spacing_set(oo, 4);
snprintf(buf, PATH_MAX, "ecco,container,%s,direction",
containers[i]);
if ((cstr = edje_file_data_get(file, buf)))
@@ -1829,9 +1829,9 @@
fprintf(stderr, "Direction %s %s\n", buf, cstr);
#endif
if (!strcmp(cstr, "horizontal"))
- e_container_direction_set(oo, 0);
+ esmart_container_direction_set(oo, 0);
else
- e_container_direction_set(oo, 1);
+ esmart_container_direction_set(oo, 1);
free(cstr);
}
#if DEBUG
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- entrance_session.c 19 Apr 2004 05:15:50 -0000 1.50
+++ entrance_session.c 22 Apr 2004 16:52:20 -0000 1.51
@@ -1,7 +1,7 @@
#include "entrance.h"
#include "entrance_session.h"
#include <X11/Xlib.h>
-#include <Esmart/container.h>
+#include <Esmart/Esmart_Container.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
@@ -500,22 +500,22 @@
return;
edje_object_part_geometry_get(e->edje, "EntranceSessionList", NULL, NULL,
&w, &h);
- if ((container = e_container_new(evas_object_evas_get(e->edje))))
+ if ((container = esmart_container_new(evas_object_evas_get(e->edje))))
{
- e_container_padding_set(container, 4, 4, 4, 4);
- e_container_spacing_set(container, 4);
- e_container_move_button_set(container, 2);
+ esmart_container_padding_set(container, 4, 4, 4, 4);
+ esmart_container_spacing_set(container, 4);
+ esmart_container_move_button_set(container, 2);
if (w > h)
{
- e_container_fill_policy_set(container,
+ esmart_container_fill_policy_set(container,
CONTAINER_FILL_POLICY_KEEP_ASPECT);
- e_container_direction_set(container, 0);
+ esmart_container_direction_set(container, 0);
}
else
{
- e_container_fill_policy_set(container,
+ esmart_container_fill_policy_set(container,
CONTAINER_FILL_POLICY_KEEP_ASPECT);
- e_container_direction_set(container, 1);
+ esmart_container_direction_set(container, 1);
}
edje_object_file_get(e->edje, &file, NULL);
for (l = e->config->sessions.keys; l; l = l->next)
@@ -525,7 +525,7 @@
{
if ((edje = entrance_x_session_edje_get(exs, e->edje, file)))
{
- e_container_element_append(container, edje);
+ esmart_container_element_append(container, edje);
}
}
}
@@ -553,22 +553,22 @@
return;
edje_object_part_geometry_get(e->edje, "EntranceUserList", NULL, NULL, &w,
&h);
- if ((container = e_container_new(evas_object_evas_get(e->edje))))
+ if ((container = esmart_container_new(evas_object_evas_get(e->edje))))
{
- e_container_padding_set(container, 4, 4, 4, 4);
- e_container_spacing_set(container, 4);
- e_container_move_button_set(container, 2);
+ esmart_container_padding_set(container, 4, 4, 4, 4);
+ esmart_container_spacing_set(container, 4);
+ esmart_container_move_button_set(container, 2);
if (w > h)
{
- e_container_fill_policy_set(container,
+ esmart_container_fill_policy_set(container,
CONTAINER_FILL_POLICY_KEEP_ASPECT);
- e_container_direction_set(container, 0);
+ esmart_container_direction_set(container, 0);
}
else
{
- e_container_fill_policy_set(container,
+ esmart_container_fill_policy_set(container,
CONTAINER_FILL_POLICY_KEEP_ASPECT);
- e_container_direction_set(container, 1);
+ esmart_container_direction_set(container, 1);
}
edje_object_file_get(e->edje, &file, NULL);
for (l = e->config->users.keys; l; l = l->next)
@@ -577,7 +577,7 @@
if ((key = evas_hash_find(e->config->users.hash, str)))
{
if ((edje = entrance_user_edje_get(key, e->edje, file)))
- e_container_element_append(container, edje);
+ esmart_container_element_append(container, edje);
}
}
edje_object_part_swallow(e->edje, "EntranceUserList", container);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/main.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- main.c 19 Apr 2004 05:15:50 -0000 1.49
+++ main.c 22 Apr 2004 16:52:20 -0000 1.50
@@ -9,7 +9,6 @@
#include <getopt.h>
#include <string.h>
#include <Edje.h>
-#include <Esmart/container.h>
#include "entrance.h"
#include "entrance_session.h"
#include "entrance_x_session.h"
-------------------------------------------------------
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
