Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_edit.c entrance_session.c entrance_user.c
entrance_x_session.c main.c
Log Message:
namespace updates, www.atmos.org/tmp/update_entrance_themes.pl for migration
assistance, old themes broken, you MUST recompile your eets
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_edit.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- entrance_edit.c 4 Dec 2004 04:26:13 -0000 1.9
+++ entrance_edit.c 8 Dec 2004 16:53:07 -0000 1.10
@@ -1379,12 +1379,12 @@
#if 0
/**
- * Set the "EntranceDate" part's text
+ * Set the "entrance.date" part's text
* @param data - the data passed when the callback was added
* @param o - the evas object(Edje) that created the signal
* @param emission - the signal "type" that was emitted
* @param source - the signal originated from this "part"
- * Attempt to set the Part named "EntranceDate" to the results of
+ * Attempt to set the Part named "entrance.date" to the results of
* localtime. This way the interval is configurable via a program in
* the theme and not statically bound to a value.
*/
@@ -1392,7 +1392,7 @@
set_date(void *data, Evas_Object * o, const char *emission,
const char *source)
{
- if (edje_object_part_exists(o, "EntranceDate"))
+ if (edje_object_part_exists(o, "entrance.date"))
{
struct tm *now;
char buf[PATH_MAX];
@@ -1400,17 +1400,17 @@
now = localtime(&_t);
strftime(buf, PATH_MAX, session->config->date.string, now);
- edje_object_part_text_set(o, "EntranceDate", buf);
+ edje_object_part_text_set(o, "entrance.date", buf);
}
}
/**
- * Set the "EntranceTime" part's text
+ * Set the "entrance.time" part's text
* @param data - the data passed when the callback was added
* @param o - the evas object(Edje) that created the signal
* @param emission - the signal "type" that was emitted
* @param source - the signal originated from this "part"
- * Attempt to set the Part named "EntranceTime" to the results of
+ * Attempt to set the Part named "entrance.time" to the results of
* localtime. This way the interval is configurable via a program in
* the theme and not statically bound to a value.
*/
@@ -1418,7 +1418,7 @@
set_time(void *data, Evas_Object * o, const char *emission,
const char *source)
{
- if (edje_object_part_exists(o, "EntranceTime"))
+ if (edje_object_part_exists(o, "entrance.time"))
{
struct tm *now;
char buf[PATH_MAX];
@@ -1426,7 +1426,7 @@
now = localtime(&_t);
strftime(buf, PATH_MAX, session->config->time.string, now);
- edje_object_part_text_set(o, "EntranceTime", buf);
+ edje_object_part_text_set(o, "entrance.time", buf);
}
}
@@ -2014,18 +2014,18 @@
}
#if 0
- if (edje_object_part_exists(edje, "EntranceTime"))
+ if (edje_object_part_exists(edje, "entrance.time"))
{
- edje_object_signal_callback_add(edje, "Go", "EntranceTime", set_time,
+ edje_object_signal_callback_add(edje, "Go", "entrance.time", set_time,
o);
- edje_object_signal_emit(edje, "Go", "EntranceTime");
+ edje_object_signal_emit(edje, "Go", "entrance.time");
timer = ecore_timer_add(0.5, timer_cb, edje);
}
- if (edje_object_part_exists(edje, "EntranceDate"))
+ if (edje_object_part_exists(edje, "entrance.date"))
{
- edje_object_signal_callback_add(edje, "Go", "EntranceDate", set_date,
+ edje_object_signal_callback_add(edje, "Go", "entrance.date", set_date,
o);
- edje_object_signal_emit(edje, "Go", "EntranceDate");
+ edje_object_signal_emit(edje, "Go", "entrance.date");
if (!timer)
timer = ecore_timer_add(0.5, timer_cb, edje);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- entrance_session.c 7 Dec 2004 02:45:30 -0000 1.63
+++ entrance_session.c 8 Dec 2004 16:53:07 -0000 1.64
@@ -159,7 +159,7 @@
{
e->authed = 1;
entrance_session_user_set(e, eu);
- edje_object_signal_emit(e->edje, "EntranceUserAuthSuccess", "");
+ edje_object_signal_emit(e->edje, "entrance,user,auth,success", "");
}
break;
}
@@ -196,14 +196,14 @@
{
entrance_auth_free(e->auth);
e->auth = entrance_auth_new();
- edje_object_signal_emit(e->edje, "In", "EntranceUserEntry");
+ edje_object_signal_emit(e->edje, "In", "entrance.entry.user");
}
}
/**
* entrance_session_user_set: forget what we know about the current user,
* load what info we can from the entrance user parameter, so we have a new
- * user in our "EntranceFace" edje
+ * user in our "entrance.users.avatar" edje
* @param e - the entrance sesssion currently running
* @param eu - the new entrance user we're setting as "current"
*/
@@ -216,7 +216,7 @@
if (e && eu)
{
- if ((obj = edje_object_part_swallow_get(e->edje, "EntranceFace")))
+ if ((obj = edje_object_part_swallow_get(e->edje,
"entrance.users.avatar")))
{
edje_object_part_unswallow(e->edje, obj);
evas_object_del(obj);
@@ -244,17 +244,17 @@
result = entrance_session_auth_user(e);
if (result == 0)
{
- if (edje_object_part_exists(e->edje, "EntranceFace"))
+ if (edje_object_part_exists(e->edje,
"entrance.users.avatar"))
{
- edje_object_part_swallow(e->edje, "EntranceFace", obj);
+ edje_object_part_swallow(e->edje,
"entrance.users.avatar", obj);
}
- edje_object_signal_emit(e->edje, "EntranceUserAuthSuccess",
+ edje_object_signal_emit(e->edje,
"entrance,user,auth,success",
"");
e->authed = 1;
}
else
{
- edje_object_signal_emit(e->edje, "EntranceUserAuthFail",
+ edje_object_signal_emit(e->edje, "entrance,user,auth,fail",
"");
evas_object_del(obj);
}
@@ -263,13 +263,13 @@
{
#endif
evas_object_layer_set(obj, evas_object_layer_get(e->edje));
- if (edje_object_part_exists(e->edje, "EntranceFace"))
+ if (edje_object_part_exists(e->edje, "entrance.users.avatar"))
{
- edje_object_part_swallow(e->edje, "EntranceFace", obj);
+ edje_object_part_swallow(e->edje, "entrance.users.avatar",
obj);
}
- edje_object_signal_emit(e->edje, "In", "EntrancePassEntry");
- edje_object_signal_emit(e->edje, "EntranceUserAuth", "");
- edje_object_signal_emit(e->edje, "UserSelected", "");
+ edje_object_signal_emit(e->edje, "In", "entrance.entry.pass");
+ edje_object_signal_emit(e->edje, "entrance,user,success", "");
+ edje_object_signal_emit(e->edje, "entrance,users,selected", "");
#if 0
}
#endif
@@ -277,8 +277,8 @@
else
{
evas_object_del(obj);
- /* edje_object_signal_emit(e->edje, "In", "EntrancePassEntry"); */
- edje_object_signal_emit(e->edje, "EntranceUserFail", "");
+ /* edje_object_signal_emit(e->edje, "In", "entrance.entry.pass");
*/
+ edje_object_signal_emit(e->edje, "entrance,user,fail", "");
}
}
}
@@ -449,16 +449,16 @@
free(e->session);
e->session = strdup(exs->session);
- old_o = edje_object_part_swallow_get(e->edje, "EntranceSession");
+ old_o = edje_object_part_swallow_get(e->edje,
"entrance.xsessions.selected");
if (old_o)
{
edje_object_part_unswallow(e->edje, old_o);
evas_object_del(old_o);
}
- edje_object_part_swallow(e->edje, "EntranceSession", o);
+ edje_object_part_swallow(e->edje, "entrance.xsessions.selected", o);
evas_object_layer_set(o, evas_object_layer_get(e->edje));
edje_object_signal_emit(e->edje, "SessionDefaultChanged", "");
- edje_object_signal_emit(e->edje, "SessionSelected", "");
+ edje_object_signal_emit(e->edje, "entrance,xsession,selected", "");
}
}
}
@@ -480,7 +480,7 @@
}
/**
- * entrance_session_xsession_list_add : fine the "EntranceSessionList" part in
the
+ * entrance_session_xsession_list_add : fine the "entrance.xsessions.list"
part in the
* main edje, setup the container to hold the elements, and create session
* edjes for the container based on our session list in the config
* @param e - the entrance session you want to add the xsession list to
@@ -498,7 +498,7 @@
if (!e || !e->edje || !e->config)
return;
- edje_object_part_geometry_get(e->edje, "EntranceSessionList", NULL, NULL,
+ edje_object_part_geometry_get(e->edje, "entrance.xsessions.list", NULL,
NULL,
&w, &h);
if ((container = esmart_container_new(evas_object_evas_get(e->edje))))
{
@@ -529,7 +529,7 @@
}
}
}
- edje_object_part_swallow(e->edje, "EntranceSessionList", container);
+ edje_object_part_swallow(e->edje, "entrance.xsessions.list", container);
e->session_container = container;
}
}
@@ -551,7 +551,7 @@
}
/**
- * entrance_session_user_list_add : find the "EntranceUserList" object in
+ * entrance_session_user_list_add : find the "entrance.users.list" object in
* the main edje, setup the container to hold the elements, and create user
* edjes for the container with our user list in the config
* @param e - the entrance session you want to add the user list to
@@ -568,7 +568,7 @@
if (!e || !e->edje)
return;
- edje_object_part_geometry_get(e->edje, "EntranceUserList", NULL, NULL, &w,
+ edje_object_part_geometry_get(e->edje, "entrance.users.list", NULL, NULL,
&w,
&h);
if ((container = esmart_container_new(evas_object_evas_get(e->edje))))
{
@@ -597,7 +597,7 @@
esmart_container_element_append(container, edje);
}
}
- edje_object_part_swallow(e->edje, "EntranceUserList", container);
+ edje_object_part_swallow(e->edje, "entrance.users.list", container);
e->user_container = container;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_user.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- entrance_user.c 27 Jun 2004 19:33:28 -0000 1.11
+++ entrance_user.c 8 Dec 2004 16:53:07 -0000 1.12
@@ -81,7 +81,7 @@
/**
* entrance_user_edje_get : get the Evas_Object(edje||image) that is
- * specified in config db. Their "EntranceFace"
+ * specified in config db. Their "entrance.users.avatar"
* @param e - the Entrance_User to get the edje for
* @param edje - a pointer to the main edje in entrance
* @return NULL on failure, a valid Evas_Object on success
@@ -122,9 +122,9 @@
/**
* FIXME: perhaps go so far as to do Gecos type stuff
*/
- edje_object_signal_callback_add(o, "UserSelected", "",
+ edje_object_signal_callback_add(o, "entrance,users,selected", "",
user_selected_cb, e);
- edje_object_signal_callback_add(o, "UserUnSelected", "",
+ edje_object_signal_callback_add(o, "entrance,users,unselected", "",
user_unselected_cb, e);
evas_object_show(result);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_x_session.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- entrance_x_session.c 27 Jun 2004 19:33:28 -0000 1.6
+++ entrance_x_session.c 8 Dec 2004 16:53:07 -0000 1.7
@@ -118,7 +118,7 @@
{
edje_object_part_text_set(edje, "EntranceSessionTitle", e->name);
}
- edje_object_signal_callback_add(edje, "SessionSelected", "",
+ edje_object_signal_callback_add(edje, "entrance,xsession,selected", "",
session_item_selected_cb,
(Entrance_X_Session *) e);
edje_object_signal_callback_add(edje, "SessionUnSelected", "",
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/main.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- main.c 7 Dec 2004 02:45:30 -0000 1.61
+++ main.c 8 Dec 2004 16:53:07 -0000 1.62
@@ -122,20 +122,20 @@
{
Evas_Object *oo = NULL;
- if (!strcmp(esmart_text_entry_edje_part_get(o), "EntrancePassEntry"))
+ if (!strcmp(esmart_text_entry_edje_part_get(o), "entrance.entry.pass"))
{
if ((oo =
evas_object_name_find(evas_object_evas_get(o),
- "EntranceUserEntry")))
+ "entrance.entry.user")))
{
esmart_text_entry_text_set(oo, "");
}
esmart_text_entry_text_set(o, "");
}
- else if (!strcmp(esmart_text_entry_edje_part_get(o), "EntranceUserEntry"))
+ else if (!strcmp(esmart_text_entry_edje_part_get(o), "entrance.entry.user"))
{
oo =
- evas_object_name_find(evas_object_evas_get(o), "EntrancePassEntry");
+ evas_object_name_find(evas_object_evas_get(o), "entrance.entry.pass");
}
if (oo)
{
@@ -157,12 +157,12 @@
o = (Evas_Object *) data;
- if (!strcmp(esmart_text_entry_edje_part_get(o), "EntranceUserEntry"))
+ if (!strcmp(esmart_text_entry_edje_part_get(o), "entrance.entry.user"))
{
if (!entrance_auth_set_user(session->auth, str))
{
edje_object_signal_emit(esmart_text_entry_edje_object_get(o),
- "EntranceUserAuth", "");
+ "entrance,user,success", "");
if ((eu = evas_hash_find(session->config->users.hash, str)))
entrance_session_user_set(session, eu);
focus_swap(o, 0);
@@ -172,11 +172,11 @@
esmart_text_entry_text_set(o, "");
entrance_session_user_reset(session);
edje_object_signal_emit(esmart_text_entry_edje_object_get(o),
- "EntranceUserFail", "");
+ "entrance,user,fail", "");
focus_swap(o, 1);
}
}
- if (!strcmp(esmart_text_entry_edje_part_get(o), "EntrancePassEntry"))
+ if (!strcmp(esmart_text_entry_edje_part_get(o), "entrance.entry.pass"))
{
if (session->auth->user && strlen(session->auth->user) > 0)
{
@@ -185,13 +185,13 @@
{
session->authed = 1;
edje_object_signal_emit(esmart_text_entry_edje_object_get(o),
- "EntranceUserAuthSuccess", "");
+ "entrance,user,auth,success", "");
}
else
{
entrance_session_user_reset(session);
edje_object_signal_emit(esmart_text_entry_edje_object_get(o),
- "EntranceUserAuthFail", "");
+ "entrance,user,auth,fail", "");
focus_swap(o, 0);
}
}
@@ -233,12 +233,12 @@
}
/**
- * Set the "EntranceDate" part's text
+ * Set the "entrance.date" part's text
* @param data - the data passed when the callback was added
* @param o - the evas object(Edje) that created the signal
* @param emission - the signal "type" that was emitted
* @param source - the signal originated from this "part"
- * Attempt to set the Part named "EntranceDate" to the results of
+ * Attempt to set the Part named "entrance.date" to the results of
* localtime. This way the interval is configurable via a program in
* the theme and not statically bound to a value.
*/
@@ -246,7 +246,7 @@
set_date(void *data, Evas_Object * o, const char *emission,
const char *source)
{
- if (edje_object_part_exists(o, "EntranceDate"))
+ if (edje_object_part_exists(o, "entrance.date"))
{
struct tm *now;
char buf[PATH_MAX];
@@ -254,17 +254,17 @@
now = localtime(&_t);
strftime(buf, PATH_MAX, session->config->date.string, now);
- edje_object_part_text_set(o, "EntranceDate", buf);
+ edje_object_part_text_set(o, "entrance.date", buf);
}
}
/**
- * Set the "EntranceTime" part's text
+ * Set the "entrance.time" part's text
* @param data - the data passed when the callback was added
* @param o - the evas object(Edje) that created the signal
* @param emission - the signal "type" that was emitted
* @param source - the signal originated from this "part"
- * Attempt to set the Part named "EntranceTime" to the results of
+ * Attempt to set the Part named "entrance.time" to the results of
* localtime. This way the interval is configurable via a program in
* the theme and not statically bound to a value.
*/
@@ -272,7 +272,7 @@
set_time(void *data, Evas_Object * o, const char *emission,
const char *source)
{
- if (edje_object_part_exists(o, "EntranceTime"))
+ if (edje_object_part_exists(o, "entrance.time"))
{
struct tm *now;
char buf[PATH_MAX];
@@ -280,7 +280,7 @@
now = localtime(&_t);
strftime(buf, PATH_MAX, session->config->time.string, now);
- edje_object_part_text_set(o, "EntranceTime", buf);
+ edje_object_part_text_set(o, "entrance.time", buf);
}
}
@@ -314,7 +314,7 @@
* @param o - the evas object(Edje) that created the signal
* @param emission - the signal "type" that was emitted
* @param source - the signal originated from this "part"
- * Attempt to set the Part named "EntranceTime" to the results of
+ * Attempt to set the Part named "entrance.time" to the results of
* localtime. This way the interval is configurable via a program in
* the theme and not statically bound to a value.
*/
@@ -336,7 +336,7 @@
* @param o - the evas object(Edje) that created the signal
* @param emission - the signal "type" that was emitted
* @param source - the signal originated from this "part"
- * Attempt to set the Part named "EntranceTime" to the results of
+ * Attempt to set the Part named "entrance.time" to the results of
* localtime. This way the interval is configurable via a program in
* the theme and not statically bound to a value.
*/
@@ -365,7 +365,7 @@
if (session && data)
{
entrance_session_user_reset(session);
-/* edje_object_signal_emit(o, "EntranceUserFail", "");*/
+/* edje_object_signal_emit(o, "entrance,user,fail", "");*/
}
}
@@ -607,7 +607,7 @@
Ecore_Timer *timer = NULL;
Evas_Object *o = NULL, *edje = NULL;
Evas_Coord x, y, w, h;
- char *entries[] = { "EntranceUserEntry", "EntrancePassEntry" };
+ char *entries[] = { "entrance.entry.user", "entrance.entry.pass" };
int entries_count = 2;
const char *container_orientation = NULL;
int c;
@@ -833,36 +833,36 @@
}
/* See if we have a EntranceHostname part, set it */
- if (edje_object_part_exists(edje, "EntranceHostname"))
+ if (edje_object_part_exists(edje, "entrance.hostname"))
{
if ((str = get_my_hostname()))
{
- edje_object_part_text_set(edje, "EntranceHostname", str);
+ edje_object_part_text_set(edje, "entrance.hostname", str);
free(str);
}
}
/* See if we have an EntranceTime part, setup a timer to automatically
update the Time */
- if (edje_object_part_exists(edje, "EntranceTime"))
+ if (edje_object_part_exists(edje, "entrance.time"))
{
- edje_object_signal_callback_add(edje, "Go", "EntranceTime", set_time,
+ edje_object_signal_callback_add(edje, "Go", "entrance.time", set_time,
o);
- edje_object_signal_emit(edje, "Go", "EntranceTime");
+ edje_object_signal_emit(edje, "Go", "entrance.time");
timer = ecore_timer_add(0.5, timer_cb, edje);
}
/* See if we have an EntranceDate part, setup a timer if one isn't
already running to automatically update the Date */
- if (edje_object_part_exists(edje, "EntranceDate"))
+ if (edje_object_part_exists(edje, "entrance.date"))
{
- edje_object_signal_callback_add(edje, "Go", "EntranceDate", set_date,
+ edje_object_signal_callback_add(edje, "Go", "entrance.date", set_date,
o);
- edje_object_signal_emit(edje, "Go", "EntranceDate");
+ edje_object_signal_emit(edje, "Go", "entrance.date");
if (!timer)
timer = ecore_timer_add(0.5, timer_cb, edje);
}
/* See if we have an EntranceSession part, set it to the first element
in the config's session list */
- if (edje_object_part_exists(edje, "EntranceSession"))
+ if (edje_object_part_exists(edje, "entrance.xsessions.selected"))
{
entrance_session_x_session_set(session,
entrance_session_x_session_default_get
@@ -870,7 +870,7 @@
}
/* See if we have an EntranceSessionList part, tell the session to load
the session list if it exists. */
- if (edje_object_part_exists(edje, "EntranceSessionList"))
+ if (edje_object_part_exists(edje, "entrance.xsessions.list"))
{
entrance_session_xsession_list_add(session);
if ((container_orientation =
@@ -888,7 +888,7 @@
}
/* See if we have an EntranceUserList part, tell the session to load
the user list if it exists. */
- if (edje_object_part_exists(edje, "EntranceUserList"))
+ if (edje_object_part_exists(edje, "entrance.users.list"))
{
entrance_session_user_list_add(session);
if ((container_orientation =
@@ -910,17 +910,17 @@
* callbacks have been added, otherwise show might not trigger all
* the desired events
*/
- edje_object_signal_callback_add(edje, "EntranceUserAuthSuccessDone", "",
+ edje_object_signal_callback_add(edje, "entrance,user,auth,success,done",
"",
done_cb, e);
- edje_object_signal_callback_add(edje, "EntranceSystemReboot", "",
+ edje_object_signal_callback_add(edje, "entrance,system,reboot", "",
reboot_cb, e);
- edje_object_signal_callback_add(edje, "EntranceSystemHalt", "",
+ edje_object_signal_callback_add(edje, "entrance,system,halt", "",
shutdown_cb, e);
edje_object_signal_callback_add(edje, "SessionDefaultSet", "",
_session_set, session);
evas_object_show(edje);
/* set focus to user input by default */
- edje_object_signal_emit(edje, "In", "EntranceUserEntry");
+ edje_object_signal_emit(edje, "In", "entrance.entry.user");
if (fullscreen)
ecore_evas_fullscreen_set(e, 1);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
