Enlightenment CVS committal
Author : pfritz
Project : e17
Module : apps/elitaire
Dir : e17/apps/elitaire/src
Modified Files:
edje_frontend_game.cpp edje_frontend_gui.cpp eli_app.cpp
elitaire.cpp elitaire_card.cpp elitaire_card_jobs.cpp
Log Message:
use namespace for edje groups
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/edje_frontend_game.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_frontend_game.cpp 6 Jul 2007 23:58:32 -0000 1.3
+++ edje_frontend_game.cpp 30 Jul 2008 23:45:36 -0000 1.4
@@ -38,7 +38,7 @@
item = edje_object_add(evas_object_evas_get(container));
- if (edje_object_file_set(item, file, "element")) {
+ if (edje_object_file_set(item, file, "elitaire/element")) {
Evas_Coord w, h;
edje_object_size_min_get(item, NULL, &h);
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/edje_frontend_gui.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_frontend_gui.cpp 23 Jul 2008 10:24:42 -0000 1.14
+++ edje_frontend_gui.cpp 30 Jul 2008 23:45:36 -0000 1.15
@@ -184,7 +184,7 @@
gui_theme =
ecore_config_theme_with_path_from_name_get(eap->theme.gui.current);
- if (edje_object_file_set(eef->gui, gui_theme, "main")) {
+ if (edje_object_file_set(eef->gui, gui_theme, "elitaire/main")) {
evas_object_move(eef->gui, 0, 0);
evas_object_repeat_events_set(eef->gui, 1);
edje_object_size_min_get(eef->gui, &w, &h);
@@ -678,7 +678,7 @@
item = edje_object_add(eef->evas);
- if (edje_object_file_set(item, file, "element")) {
+ if (edje_object_file_set(item, file, "elitaire/element")) {
Evas_Coord w, h;
edje_object_size_min_get(item, NULL, &h);
@@ -732,7 +732,7 @@
Evas_Object * item;
item = edje_object_add(evas_object_evas_get(container));
- if (edje_object_file_set(item, file, "element")) {
+ if (edje_object_file_set(item, file, "elitaire/element")) {
Evas_Coord w, h;
edje_object_size_min_get(item, NULL, &h);
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/eli_app.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- eli_app.cpp 25 Jul 2007 17:00:52 -0000 1.3
+++ eli_app.cpp 30 Jul 2008 23:45:36 -0000 1.4
@@ -216,7 +216,7 @@
if (!strcmp(frontend, "edje")) {
eli_frontend_edje_init(eap, eap->frontend);
- eli_frontend_ewl_dialogs_init(eap);
+ eli_frontend_ewl_dialogs_init(eap);
}
else return false;
@@ -230,12 +230,12 @@
/* THEME */
ecore_config_theme_default("/theme/gui", "e17");
- ecore_config_theme_preview_group_set("/theme/gui", "main");
+ ecore_config_theme_preview_group_set("/theme/gui", "elitaire/main");
ecore_config_listen("theme", "/theme/gui", _eli_app_config_listen_cb,
THEME, eap);
/* CARDS */
ecore_config_theme_default("/theme/cards", "default_cards");
- ecore_config_theme_preview_group_set("/theme/cards", "01");
+ ecore_config_theme_preview_group_set("/theme/cards", "elitaire/01");
ecore_config_listen("cards", "/theme/cards", _eli_app_config_listen_cb,
CARDS, eap);
/* VELOCITY */
@@ -333,10 +333,10 @@
file = ecore_config_theme_with_path_from_name_get(name);
/* selecting the gui theme */
- if (edje_file_group_exists(file, "main"))
+ if (edje_file_group_exists(file, "elitaire/main"))
ecore_list_append(gui, name);
/* selecting the card theme */
- if (edje_file_group_exists(file, "01"))
+ if (edje_file_group_exists(file, "elitaire/card/01"))
ecore_list_append(cards, name);
free(file);
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/elitaire.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- elitaire.cpp 9 Aug 2007 21:45:49 -0000 1.3
+++ elitaire.cpp 30 Jul 2008 23:45:36 -0000 1.4
@@ -190,7 +190,7 @@
/* get the maximal and minimal size of the cards via edje */
/* I expect that every card in the game has the same size */
card = edje_object_add(eli->evas);
- if (!edje_object_file_set(card, eli->file, "00")) return 0;
+ if (!edje_object_file_set(card, eli->file, "elitaire/card/00")) return 0;
edje_object_size_max_get(card, &eli->card_max_w, &eli->card_max_h);
edje_object_size_min_get(card, &eli->card_min_w, &eli->card_min_h);
@@ -239,7 +239,7 @@
case LAST:
eli->stacks[number] = edje_object_add(eli->evas);
evas_object_smart_member_add(eli->stacks[number], elitaire);
- edje_object_file_set(eli->stacks[number], eli->file, "LAST");
+ edje_object_file_set(eli->stacks[number], eli->file,
"elitaire/stack/last");
evas_object_event_callback_add(eli->stacks[number],
EVAS_CALLBACK_MOUSE_UP,
_elitaire_stack_mouse_up_cb, eli);
@@ -251,7 +251,7 @@
case ALL:
eli->stacks[number] = edje_object_add(eli->evas);
evas_object_smart_member_add(eli->stacks[number], elitaire);
- edje_object_file_set(eli->stacks[number], eli->file, "ALL");
+ edje_object_file_set(eli->stacks[number], eli->file,
"elitaire/stack/all");
evas_object_event_callback_add(eli->stacks[number],
EVAS_CALLBACK_MOUSE_UP,
_elitaire_stack_mouse_up_cb, eli);
@@ -656,24 +656,6 @@
}
}
return false;
-}
-
-/* this function convert an integer val int to an char array buf
- * it use the base=10 , be carful, it doesn"t alloc any memory
- * so the buf array should have
- * (length+1) elements */
-
-char * itoa(int val, char * buf, int length)
-{
-
- buf[length--] = 0;
-
- do {
- buf[length--] = "0123456789"[val % 10];
- val /= 10;
- } while (length + 1);
-
- return buf;
}
/**********
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/elitaire_card.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- elitaire_card.cpp 9 Aug 2007 21:45:49 -0000 1.4
+++ elitaire_card.cpp 30 Jul 2008 23:45:36 -0000 1.5
@@ -28,13 +28,14 @@
{
Evas_Object * card;
Elitaire_Card * data = NULL;
- char buffer[3];
+ char buffer[128];
card = evas_object_smart_add(eli->evas, _elitaire_card_smart_get());
data = (Elitaire_Card *) evas_object_smart_data_get(card);
if (data) {
- itoa(pcard->getName(), buffer, 2);
+ snprintf(buffer, sizeof(buffer), "elitaire/card/%02d",
+ pcard->getName());
data->image = edje_object_add(eli->evas);
evas_object_smart_member_add(data->image, card);
data->pcard = pcard;
@@ -49,7 +50,8 @@
buffer);
}
else {
- if (!edje_object_file_set(data->image, eli->file, "bg"))
+ if (!edje_object_file_set(data->image, eli->file,
+ "elitaire/card/bg"))
fprintf(stderr, _("Elitaire Error: The bg pic is missed!\n"));
}
}
@@ -200,7 +202,7 @@
void elitaire_card_reinit(Evas_Object * card)
{
Elitaire_Card * data = NULL;
- char buffer[3];
+ char buffer[128];
data = (Elitaire_Card *) evas_object_smart_data_get(card);
@@ -214,13 +216,15 @@
new_image = edje_object_add(data->eli->evas);
if (data->pcard->isVisible()) {
- itoa(data->pcard->getName(), buffer, 2);
+ snprintf(buffer, sizeof(buffer), "elitaire/card/%02d",
+
data->pcard->getName());
if (!edje_object_file_set(new_image, data->eli->file, buffer))
fprintf(stderr, _("Elitaire Error: Card %s is missed!\n"),
buffer);
}
else {
- if (!edje_object_file_set(new_image, data->eli->file, "bg"))
+ if (!edje_object_file_set(new_image, data->eli->file,
+ "elitaire/card/bg"))
fprintf(stderr, _("Elitaire Error: The bg pic is missed!\n"));
}
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/elitaire_card_jobs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- elitaire_card_jobs.cpp 6 Oct 2007 22:01:36 -0000 1.4
+++ elitaire_card_jobs.cpp 30 Jul 2008 23:45:36 -0000 1.5
@@ -390,7 +390,7 @@
data->shadow = edje_object_add(data->eli->evas);
evas_object_smart_member_add(data->shadow, card);
- if (!edje_object_file_set(data->shadow, data->eli->file, "shadow"))
+ if (!edje_object_file_set(data->shadow, data->eli->file,
"elitaire/card/shadow"))
fprintf(stderr, _("Elitaire Error: The shadow pic is missed!\n"));
n = elitaire_card_chain_length_calc(card);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
