enlightenment
/
enlightenment
5
6
Fork 8
Code Issues 17 Pull Requests Projects Releases Wiki Activity

Edjes now use 'edj' as the filename extension

Browse Source 
SVN revision: 13856
devs/princeamd/enlightenment-0.17-elive
tsauerbeck 18 years ago committed by tsauerbeck
parent d97d47b3ed
commit 28b6407d93
16 changed files with 92 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      data/icons/Makefile.am
  2. 8
      data/init/Makefile.am
  3. 8
      data/themes/Makefile.am
  4. 16
      src/bin/e_border.c
  5. 2
      src/bin/e_config.c
  6. 6
      src/bin/e_error.c
  7. 20
      src/bin/e_gadman.c
  8. 8
      src/bin/e_init.c
  9. 16
      src/bin/e_int_menus.c
  10. 36
      src/bin/e_menu.c
  11. 4
      src/modules/battery/e_mod_main.c
  12. 4
      src/modules/clock/e_mod_main.c
  13. 16
      src/modules/ibar/e_mod_main.c
  14. 16
      src/modules/ibox/e_mod_main.c
  15. 12
      src/modules/pager/e_mod_main.c
  16. 4
      src/modules/temperature/e_mod_main.c

8
data/icons/Makefile.am
Unescape View File

@ -10,15 +10,15 @@ EDJE_FLAGS = \
filesdir = $(datadir)/enlightenment/data/icons
files_DATA = \
default.eet
default.edj
EXTRA_DIST = default.edc
default.eet: Makefile default.edc
default.edj: Makefile default.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/icons/default.edc \
$(top_builddir)/data/icons/default.eet
$(top_builddir)/data/icons/default.edj
clean-local:
rm -f *.eet
rm -f *.edj

8
data/init/Makefile.am
Unescape View File

@ -10,15 +10,15 @@ EDJE_FLAGS = \
filesdir = $(datadir)/enlightenment/data/init
files_DATA = \
init.eet
init.edj
EXTRA_DIST = init.edc
init.eet: Makefile init.edc
init.edj: Makefile init.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/init/init.edc \
$(top_builddir)/data/init/init.eet
$(top_builddir)/data/init/init.edj
clean-local:
rm -f *.eet
rm -f *.edj

8
data/themes/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ EDJE_FLAGS = \
filesdir = $(datadir)/enlightenment/data/themes
files_DATA = \
default.eet
default.edj
EXTRA_DIST = \
default.edc \
@ -26,10 +26,10 @@ default_resize.edc \
default_temperature.edc \
default_error.edc
default.eet: Makefile $(EXTRA_DIST)
default.edj: Makefile $(EXTRA_DIST)
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/default.edc \
$(top_builddir)/data/themes/default.eet
$(top_builddir)/data/themes/default.edj
clean-local:
rm -f *.eet
rm -f *.edj

16
src/bin/e_border.c
Unescape View File

@ -2524,8 +2524,8 @@ _e_border_eval(E_Border *bd)
}
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 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
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_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
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 @@ _e_border_resize_begin(E_Border *bd)
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);

2
src/bin/e_config.c
Unescape View File

@ -74,7 +74,7 @@ e_config_init(void)
{
/* 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;

6
src/bin/e_error.c
Unescape View File

@ -77,8 +77,8 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
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 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
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);

20
src/bin/e_gadman.c
Unescape View File

@ -480,7 +480,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
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 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
}
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 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
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_gadman_client_menu_new(E_Gadman_Client *gmc)
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 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
}
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 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
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 @@ _e_gadman_client_edit_begin(E_Gadman_Client *gmc)
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);

8
src/bin/e_init.c
Unescape View File

@ -60,16 +60,16 @@ e_init_init(void)
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);

16
src/bin/e_int_menus.c
Unescape View File

@ -56,7 +56,7 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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 @@ e_int_menus_main_new(void)
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;

36
src/bin/e_menu.c
Unescape View File

@ -758,8 +758,8 @@ _e_menu_item_realize(E_Menu_Item *mi)
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 @@ _e_menu_item_realize(E_Menu_Item *mi)
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 @@ _e_menu_item_realize(E_Menu_Item *mi)
{
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 @@ _e_menu_item_realize(E_Menu_Item *mi)
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 @@ _e_menu_item_realize(E_Menu_Item *mi)
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 @@ _e_menu_item_realize(E_Menu_Item *mi)
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 @@ _e_menu_item_realize(E_Menu_Item *mi)
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 @@ _e_menu_item_realize(E_Menu_Item *mi)
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 @@ _e_menu_realize(E_Menu *m)
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);

4
src/modules/battery/e_mod_main.c
Unescape View File

@ -493,8 +493,8 @@ _battery_face_new(E_Container *con)
ef->bat_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"),
"modules/battery/main");
evas_object_show(o);

4
src/modules/clock/e_mod_main.c
Unescape View File

@ -221,8 +221,8 @@ _clock_face_new(E_Container *con)
face->clock_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"),
"modules/clock/main");
evas_object_show(o);

16
src/modules/ibar/e_mod_main.c
Unescape View File

@ -428,8 +428,8 @@ _ibar_bar_new(IBar *ib, E_Container *con)
o = edje_object_add(ibb->evas);
ibb->bar_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"),
"modules/ibar/main");
evas_object_show(o);
@ -437,8 +437,8 @@ _ibar_bar_new(IBar *ib, E_Container *con)
ibb->overlay_object = o;
evas_object_layer_set(o, 1);
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"),
"modules/ibar/follower");
evas_object_show(o);
@ -611,8 +611,8 @@ _ibar_icon_new(IBar_Bar *ibb, E_App *a)
evas_object_intercept_move_callback_add(o, _ibar_icon_cb_intercept_move, ic);
evas_object_intercept_resize_callback_add(o, _ibar_icon_cb_intercept_resize, ic);
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"),
"modules/ibar/icon");
evas_object_show(o);
@ -630,8 +630,8 @@ _ibar_icon_new(IBar_Bar *ibb, E_App *a)
evas_object_intercept_move_callback_add(o, _ibar_icon_cb_intercept_move, ic);
evas_object_intercept_resize_callback_add(o, _ibar_icon_cb_intercept_resize, ic);
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"),
"modules/ibar/icon_overlay");
evas_object_show(o);

16
src/modules/ibox/e_mod_main.c
Unescape View File

@ -755,8 +755,8 @@ _ibox_box_icon_new(IBox_Box *ibb, E_App *a, E_Border *bd)
evas_object_intercept_move_callback_add(o, _ibox_cb_intercept_icon_move, ic);
evas_object_intercept_resize_callback_add(o, _ibox_cb_intercept_icon_resize, ic);
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"),
"modules/ibar/icon");
edje_object_signal_emit(o, "set_orientation", _ibox_main_orientation[ibb->ibox->conf->edge]);
edje_object_message_signal_process(o);
@ -776,8 +776,8 @@ _ibox_box_icon_new(IBox_Box *ibb, E_App *a, E_Border *bd)
evas_object_intercept_move_callback_add(o, _ibox_cb_intercept_icon_move, ic);
evas_object_intercept_resize_callback_add(o, _ibox_cb_intercept_icon_resize, ic);
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"),
"modules/ibar/icon_overlay");
edje_object_signal_emit(o, "set_orientation", _ibox_main_orientation[ibb->ibox->conf->edge]);
edje_object_message_signal_process(o);
@ -1041,8 +1041,8 @@ _ibox_box_init(IBox_Box *ibb)
o = edje_object_add(ibb->evas);
ibb->box_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"),
"modules/ibar/main");
edje_object_signal_emit(o, "set_orientation", _ibox_main_orientation[ibb->ibox->conf->edge]);
edje_object_message_signal_process(o);
@ -1059,8 +1059,8 @@ _ibox_box_init(IBox_Box *ibb)
ibb->overlay_object = o;
evas_object_layer_set(o, 1);
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"),
"modules/ibar/follower");
edje_object_signal_emit(o, "set_orientation", _ibox_main_orientation[ibb->ibox->conf->edge]);
edje_object_message_signal_process(o);

12
src/modules/pager/e_mod_main.c
Unescape View File

@ -326,8 +326,8 @@ _pager_face_new(E_Zone *zone)
o = edje_object_add(face->evas);
face->pager_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"),
"modules/pager/main");
evas_object_show(o);
@ -503,8 +503,8 @@ _pager_desk_new(Pager_Face *face, E_Desk *desk, int xpos, int ypos)
o = edje_object_add(face->evas);
pd->desk_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"),
"modules/pager/desk");
e_table_pack(face->table_object, o, xpos, ypos, 1, 1);
e_table_pack_options_set(o, 1, 1, 1, 1, 0.5, 0.5, 0, 0, -1, -1);
@ -583,8 +583,8 @@ _pager_window_new(Pager_Desk *pd, E_Border *border)
o = edje_object_add(pd->face->evas);
pw->window_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"),
"modules/pager/window");
if (visible) evas_object_show(o);
e_layout_pack(pd->layout_object, pw->window_object);

4
src/modules/temperature/e_mod_main.c
Unescape View File

@ -636,8 +636,8 @@ _temperature_face_new(E_Container *con)
ef->temp_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"),
"modules/temperature/main");
evas_object_show(o);

Write Preview
Loading…
Cancel
Save