Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_config.c e_error.c e_gadman.c e_init.c
e_int_menus.c e_menu.c
Log Message:
Edjes now use 'edj' as the filename extension
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- e_border.c 20 Mar 2005 19:07:20 -0000 1.121
+++ e_border.c 22 Mar 2005 19:30:25 -0000 1.122
@@ -2524,8 +2524,8 @@
}
o = edje_object_add(bd->bg_evas);
bd->bg_object = o;
- /* FIXME: "default.eet" needs to come from conf */
- path = e_path_find(path_themes, "default.eet");
+ /* FIXME: "default.edj" needs to come from conf */
+ path = e_path_find(path_themes, "default.edj");
snprintf(buf, sizeof(buf), "widgets/border/%s/border",
bd->client.border.name);
ok = edje_object_file_set(o, path, buf);
@@ -3192,12 +3192,12 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Close");
e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd);
- e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.eet"),
"widgets/border/default/close");
+ e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/close");
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Iconify");
e_menu_item_callback_set(mi, _e_border_menu_cb_iconify, bd);
- e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.eet"),
"widgets/border/default/minimize");
+ e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/minimize");
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@@ -3207,21 +3207,21 @@
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->shaded ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_shade, bd);
- e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.eet"),
"widgets/border/default/shade");
+ e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/shade");
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Maximized");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->maximized ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd);
- e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.eet"),
"widgets/border/default/maximize");
+ e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/maximize");
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Sticky");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->sticky ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_stick, bd);
- e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.eet"),
"widgets/border/default/stick");
+ e_menu_item_icon_edje_set(mi, e_path_find(path_themes, "default.edj"),
"widgets/border/default/stick");
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@@ -3541,7 +3541,7 @@
ecore_evas_show(resize_ee);
resize_obj = edje_object_add(ecore_evas_get(resize_ee));
- edje_object_file_set(resize_obj, e_path_find(path_themes, "default.eet"),
+ edje_object_file_set(resize_obj, e_path_find(path_themes, "default.edj"),
"widgets/border/default/resize");
snprintf(buf, sizeof(buf), "9999x9999");
edje_object_part_text_set(resize_obj, "text", buf);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_config.c 21 Mar 2005 01:56:42 -0000 1.24
+++ e_config.c 22 Mar 2005 19:30:26 -0000 1.25
@@ -74,7 +74,7 @@
{
/* DEFAULT CONFIG */
e_config = E_NEW(E_Config, 1);
- e_config->desktop_default_background =
strdup(PACKAGE_DATA_DIR"/data/themes/default.eet");
+ e_config->desktop_default_background =
strdup(PACKAGE_DATA_DIR"/data/themes/default.edj");
e_config->menus_scroll_speed = 1000.0;
e_config->menus_fast_mouse_move_thresthold = 300.0;
e_config->menus_click_drag_timeout = DEF_MENUCLICK;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_error.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_error.c 19 Mar 2005 17:31:42 -0000 1.11
+++ e_error.c 22 Mar 2005 19:30:26 -0000 1.12
@@ -77,8 +77,8 @@
o = edje_object_add(e);
if (!edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come from conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from conf */
+ e_path_find(path_themes, "default.edj"),
"error/main"))
{
@@ -257,7 +257,7 @@
snprintf(format, sizeof(format),
"source='%s' font='%s' size=%d wrap=word",
- e_path_find(path_themes, "default.eet"),
+ e_path_find(path_themes, "default.edj"),
"fonts/Edje Vera", 10);
text = evas_object_textblock_add(e);
evas_object_color_set(text, 0, 0, 0, 255);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_gadman.c 14 Mar 2005 04:27:03 -0000 1.25
+++ e_gadman.c 22 Mar 2005 19:30:27 -0000 1.26
@@ -480,7 +480,7 @@
e_menu_item_label_set(mi, "Automatic Width");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->use_autow);
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons,
"default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons,
"default.edj"),
"auto_width");
e_menu_item_callback_set(mi, _e_gadman_cb_auto_width, gmc);
mi = e_menu_item_new(m);
@@ -488,12 +488,12 @@
}
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Half Screen Width");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"half_width");
e_menu_item_callback_set(mi, _e_gadman_cb_half_width, gmc);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Full Screen Width");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"full_width");
e_menu_item_callback_set(mi, _e_gadman_cb_full_width, gmc);
}
@@ -504,7 +504,7 @@
seperator = 1;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Center Horizontally");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"center_horiz");
e_menu_item_callback_set(mi, _e_gadman_cb_center_horiz, gmc);
}
@@ -523,7 +523,7 @@
e_menu_item_label_set(mi, "Automatic Height");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->use_autoh);
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons,
"default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons,
"default.edj"),
"auto_eight");
e_menu_item_callback_set(mi, _e_gadman_cb_auto_height, gmc);
mi = e_menu_item_new(m);
@@ -531,12 +531,12 @@
}
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Half Screen Height");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"half_height");
e_menu_item_callback_set(mi, _e_gadman_cb_half_height, gmc);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Full Screen Height");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"full_height");
e_menu_item_callback_set(mi, _e_gadman_cb_full_height, gmc);
}
@@ -547,7 +547,7 @@
seperator = 1;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Center Vertically");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"center_vert");
e_menu_item_callback_set(mi, _e_gadman_cb_center_vert, gmc);
}
@@ -589,8 +589,8 @@
evas_object_move(gmc->control_object, gmc->x, gmc->y);
evas_object_resize(gmc->control_object, gmc->w, gmc->h);
edje_object_file_set(gmc->control_object,
- /* FIXME: "default.eet" needs to come from conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from conf */
+ e_path_find(path_themes, "default.edj"),
"gadman/control");
edje_object_signal_callback_add(gmc->control_object, "move_start", "",
_e_gadman_cb_signal_move_start, gmc);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_init.c 11 Mar 2005 13:09:06 -0000 1.13
+++ e_init.c 22 Mar 2005 19:30:28 -0000 1.14
@@ -60,16 +60,16 @@
if (l == screens)
{
edje_object_file_set(o,
- /* FIXME: "init.eet" needs to come from
config */
- e_path_find(path_init, "init.eet"),
+ /* FIXME: "init.edj" needs to come from
config */
+ e_path_find(path_init, "init.edj"),
"init/splash");
_e_init_object = o;
}
/* other screens */
else
edje_object_file_set(o,
- /* FIXME: "init.eet" needs to come from config */
- e_path_find(path_init, "init.eet"),
+ /* FIXME: "init.edj" needs to come from config */
+ e_path_find(path_init, "init.edj"),
"init/extra_screen");
evas_object_move(o, scr->x, scr->y);
evas_object_resize(o, scr->w, scr->h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_int_menus.c 21 Mar 2005 16:00:15 -0000 1.40
+++ e_int_menus.c 22 Mar 2005 19:30:28 -0000 1.41
@@ -56,7 +56,7 @@
dat->apps = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Favorite Applications");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"favorites");
e_menu_item_submenu_set(mi, subm);
@@ -67,7 +67,7 @@
dat->modules = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Modules");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"module");
e_menu_item_submenu_set(mi, subm);
@@ -75,7 +75,7 @@
dat->desktops = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Desktops");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"desktops");
e_menu_item_submenu_set(mi, subm);
@@ -83,7 +83,7 @@
dat->clients = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Windows");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"windows");
e_menu_item_submenu_set(mi, subm);
@@ -91,7 +91,7 @@
dat->gadgets = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Gadgets");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"gadgets");
e_menu_item_submenu_set(mi, subm);
@@ -100,7 +100,7 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "About Enlightenment");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"e");
e_menu_item_callback_set(mi, _e_int_menus_main_about, NULL);
@@ -109,13 +109,13 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Restart Enlightement");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"reset");
e_menu_item_callback_set(mi, _e_int_menus_main_restart, NULL);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, "Exit Enlightement");
- e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+ e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.edj"),
"power");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
return m;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_menu.c 11 Mar 2005 11:05:52 -0000 1.13
+++ e_menu.c 22 Mar 2005 19:30:29 -0000 1.14
@@ -758,8 +758,8 @@
o = edje_object_add(mi->menu->evas);
mi->separator_object = o;
edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come from conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/separator");
evas_object_show(o);
edje_object_size_min_calc(mi->separator_object, &ww, &hh);
@@ -777,8 +777,8 @@
if (mi->submenu)
{
if (!edje_object_file_set(mi->bg_object,
- /* FIXME: "default.eet" needs to come
from conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come
from conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/submenu_bg"))
goto no_submenu_item;
}
@@ -786,8 +786,8 @@
{
no_submenu_item:
edje_object_file_set(mi->bg_object,
- /* FIXME: "default.eet" needs to come from
conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from
conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/item_bg");
}
evas_object_show(o);
@@ -805,8 +805,8 @@
o = edje_object_add(mi->menu->evas);
mi->toggle_object = o;
edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come from
conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from
conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/check");
evas_object_pass_events_set(o, 1);
evas_object_show(o);
@@ -820,8 +820,8 @@
o = edje_object_add(mi->menu->evas);
mi->toggle_object = o;
edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come from
conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from
conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/radio");
evas_object_pass_events_set(o, 1);
evas_object_show(o);
@@ -844,8 +844,8 @@
o = edje_object_add(mi->menu->evas);
if (edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come
from conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come
from conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/icon"))
{
mi->icon_bg_object = o;
@@ -913,8 +913,8 @@
o = edje_object_add(mi->menu->evas);
mi->label_object = o;
edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come from
conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from
conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/label");
/* default label */
edje_object_part_text_set(o, "label", mi->label);
@@ -938,8 +938,8 @@
o = edje_object_add(mi->menu->evas);
mi->submenu_object = o;
edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come from
conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from
conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/submenu");
evas_object_pass_events_set(o, 1);
evas_object_show(o);
@@ -1009,8 +1009,8 @@
evas_object_move(o, 0, 0);
evas_object_resize(o, m->cur.w, m->cur.h);
edje_object_file_set(o,
- /* FIXME: "default.eet" needs to come from conf */
- e_path_find(path_themes, "default.eet"),
+ /* FIXME: "default.edj" needs to come from conf */
+ e_path_find(path_themes, "default.edj"),
"widgets/menu/default/background");
evas_object_show(o);
-------------------------------------------------------
This SF.net email is sponsored by: 2005 Windows Mobile Application Contest
Submit applications for Windows Mobile(tm)-based Pocket PCs or Smartphones
for the chance to win $25,000 and application distribution. Enter today at
http://ads.osdn.com/?ad_id=6882&alloc_id=15148&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
