summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-09-11 16:29:00 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-09-11 16:29:00 +0900
commitd884770f2daadb63925b96ddc6180b440511666d (patch)
treec1b73843632759f0276ed59a814c3f195b48bb68
parentbe2a592feacf7cfbaac6d917f8769e36feab31b8 (diff)
Revert "rename pager theme stuff to pager_plain to match current elm"enlightenment-0.18
This reverts commit 4bca1ed0efcf489b684399c72c8b6a984d61f936. no - this breaks theme api. AGAIN ... like e18. see email to e-devel.
-rw-r--r--src/modules/pager/e_mod_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 719ab4618..f69b11e75 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -432,7 +432,7 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos, Eina_Bool invert)
432 o = edje_object_add(e); 432 o = edje_object_add(e);
433 pd->o_desk = o; 433 pd->o_desk = o;
434 e_theme_edje_object_set(o, "base/theme/modules/pager", 434 e_theme_edje_object_set(o, "base/theme/modules/pager",
435 "e/modules/pager_plain/desk"); 435 "e/modules/pager/desk");
436 edje_object_part_text_set(o, "e.text.label", desk->name); 436 edje_object_part_text_set(o, "e.text.label", desk->name);
437 if (pager_config->show_desk_names) 437 if (pager_config->show_desk_names)
438 edje_object_signal_emit(o, "e,name,show", "e"); 438 edje_object_signal_emit(o, "e,name,show", "e");
@@ -664,7 +664,7 @@ _pager_window_new(Pager_Desk *pd, E_Border *border)
664 o = edje_object_add(evas_object_evas_get(pd->pager->o_table)); 664 o = edje_object_add(evas_object_evas_get(pd->pager->o_table));
665 pw->o_window = o; 665 pw->o_window = o;
666 e_theme_edje_object_set(o, "base/theme/modules/pager", 666 e_theme_edje_object_set(o, "base/theme/modules/pager",
667 "e/modules/pager_plain/window"); 667 "e/modules/pager/window");
668 if (visible) evas_object_show(o); 668 if (visible) evas_object_show(o);
669 669
670 e_layout_pack(pd->o_layout, pw->o_window); 670 e_layout_pack(pd->o_layout, pw->o_window);
@@ -795,7 +795,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
795 795
796 pp->o_bg = edje_object_add(pp->popup->evas); 796 pp->o_bg = edje_object_add(pp->popup->evas);
797 e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager", 797 e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager",
798 "e/modules/pager_plain/popup"); 798 "e/modules/pager/popup");
799 desk = e_desk_current_get(zone); 799 desk = e_desk_current_get(zone);
800 if (desk) 800 if (desk)
801 edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name); 801 edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name);
@@ -1930,7 +1930,7 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U
1930 1930
1931 o = edje_object_add(drag->evas); 1931 o = edje_object_add(drag->evas);
1932 e_theme_edje_object_set(o, "base/theme/modules/pager", 1932 e_theme_edje_object_set(o, "base/theme/modules/pager",
1933 "e/modules/pager_plain/window"); 1933 "e/modules/pager/window");
1934 evas_object_show(o); 1934 evas_object_show(o);
1935 1935
1936 oo = e_border_icon_add(pw->border, drag->evas); 1936 oo = e_border_icon_add(pw->border, drag->evas);
@@ -2311,7 +2311,7 @@ _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
2311 /* redraw the desktop theme above */ 2311 /* redraw the desktop theme above */
2312 o = edje_object_add(drag->evas); 2312 o = edje_object_add(drag->evas);
2313 e_theme_edje_object_set(o, "base/theme/modules/pager", 2313 e_theme_edje_object_set(o, "base/theme/modules/pager",
2314 "e/modules/pager_plain/desk"); 2314 "e/modules/pager/desk");
2315 evas_object_show(o); 2315 evas_object_show(o);
2316 e_drag_object_set(drag, o); 2316 e_drag_object_set(drag, o);
2317 2317
@@ -2332,7 +2332,7 @@ _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
2332 2332
2333 o = edje_object_add(drag->evas); 2333 o = edje_object_add(drag->evas);
2334 e_theme_edje_object_set(o, "base/theme/modules/pager", 2334 e_theme_edje_object_set(o, "base/theme/modules/pager",
2335 "e/modules/pager_plain/window"); 2335 "e/modules/pager/window");
2336 e_layout_pack(oo, o); 2336 e_layout_pack(oo, o);
2337 e_layout_child_raise(o); 2337 e_layout_child_raise(o);
2338 e_zone_useful_geometry_get(pw->desk->desk->zone, 2338 e_zone_useful_geometry_get(pw->desk->desk->zone,