diff --git a/data/themes/default_about.edc b/data/themes/default_about.edc index 433bb9e94..ff00d86e3 100644 --- a/data/themes/default_about.edc +++ b/data/themes/default_about.edc @@ -29,7 +29,7 @@ styles } group { - name: "widgets/about/main"; + name: "e/widgets/about/main"; parts { part { name: "base"; diff --git a/data/themes/default_background.edc b/data/themes/default_background.edc index 8c95258f3..157411a45 100644 --- a/data/themes/default_background.edc +++ b/data/themes/default_background.edc @@ -3,7 +3,7 @@ images { image: "e17_"SM"reflection_shadow_overlay.png" LOSSY 90; } group { - name: "desktop/background"; + name: "e/desktop/background"; parts { part { name: "background_image"; diff --git a/data/themes/default_battery.edc b/data/themes/default_battery.edc index e7e2dd4f3..28611c246 100644 --- a/data/themes/default_battery.edc +++ b/data/themes/default_battery.edc @@ -13,7 +13,7 @@ images { image: "e17_battery_ac.png" COMP; } group { - name: "modules/battery/main"; + name: "e/modules/battery/main"; max: 128 128; script { public message(Msg_Type:type, id, ...) { diff --git a/data/themes/default_border.edc b/data/themes/default_border.edc index a62630dd3..3462d8f03 100644 --- a/data/themes/default_border.edc +++ b/data/themes/default_border.edc @@ -194,7 +194,7 @@ BORDER_BUTTON_ADV(NAME,TYPE,REL1X,REL1Y,OFF1X,OFF1Y,TO1,TO1,REL2X,REL2Y,OFF2X,OF #define FULL_SIZE_BORDER_BUTTON(TYPE) \ group { \ - name: "widgets/border/default/"TYPE; \ + name: "e/widgets/border/default/"TYPE; \ parts { \ part { \ name: "whole"; \ @@ -261,7 +261,7 @@ images { } group { - name: "widgets/border/default/border"; + name: "e/widgets/border/default/border"; // ALSO: // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped data { @@ -1541,7 +1541,7 @@ group { } group { - name: "widgets/border/shaped/border"; + name: "e/widgets/border/shaped/border"; // ALSO: // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped data { @@ -2584,7 +2584,7 @@ group { } group { - name: "widgets/border/dialog/border"; + name: "e/widgets/border/dialog/border"; // ALSO: // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped data { @@ -3733,7 +3733,7 @@ group { } group { - name: "widgets/border/noresize_dialog/border"; + name: "e/widgets/border/noresize_dialog/border"; // ALSO: // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped data { @@ -4800,7 +4800,7 @@ group { } group { - name: "widgets/border/pixel/border"; + name: "e/widgets/border/pixel/border"; // ALSO: // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped data { diff --git a/data/themes/default_button.edc b/data/themes/default_button.edc index 23551ece4..7e1664b37 100644 --- a/data/themes/default_button.edc +++ b/data/themes/default_button.edc @@ -9,7 +9,7 @@ images { } group { - name: "widgets/button"; + name: "e/widgets/button"; parts { part { name: "button_image"; diff --git a/data/themes/default_check.edc b/data/themes/default_check.edc index c4d49a6c1..0535d7eb7 100644 --- a/data/themes/default_check.edc +++ b/data/themes/default_check.edc @@ -5,7 +5,7 @@ images { image: "focus.png" COMP; } group { - name: "widgets/check"; + name: "e/widgets/check"; parts { part { name: "outline"; @@ -193,7 +193,7 @@ group { } group { - name: "widgets/check_icon"; + name: "e/widgets/check_icon"; parts { part { name: "outline"; diff --git a/data/themes/default_clock.edc b/data/themes/default_clock.edc index ac4e9563a..3d160afb4 100644 --- a/data/themes/default_clock.edc +++ b/data/themes/default_clock.edc @@ -183,7 +183,7 @@ images { image: "e17_clock_minutes_59.png" COMP; } group { - name: "modules/clock/main"; + name: "e/modules/clock/main"; script { public clock_cb(val) { new buf[11]; diff --git a/data/themes/default_color_well.edc b/data/themes/default_color_well.edc index 43306a625..3d8954168 100644 --- a/data/themes/default_color_well.edc +++ b/data/themes/default_color_well.edc @@ -3,7 +3,7 @@ images { } group { - name: "widgets/color_well"; + name: "e/widgets/color_well"; parts { part { name: "background"; diff --git a/data/themes/default_configure.edc b/data/themes/default_configure.edc index 24c2c74a7..c69aa48b9 100644 --- a/data/themes/default_configure.edc +++ b/data/themes/default_configure.edc @@ -9,7 +9,7 @@ images { } group { - name: "widgets/configure/main"; + name: "e/widgets/configure/main"; parts { part { name: "base"; diff --git a/data/themes/default_cpufreq.edc b/data/themes/default_cpufreq.edc index f7faef76c..0f308f148 100644 --- a/data/themes/default_cpufreq.edc +++ b/data/themes/default_cpufreq.edc @@ -19,7 +19,7 @@ images { } group { - name: "modules/cpufreq/main"; + name: "e/modules/cpufreq/main"; min: 4 4; max: 128 128; diff --git a/data/themes/default_cslider.edc b/data/themes/default_cslider.edc index 80a8ba3a3..a3ec60b0c 100644 --- a/data/themes/default_cslider.edc +++ b/data/themes/default_cslider.edc @@ -1,5 +1,5 @@ group { - name: "widgets/cslider"; + name: "e/widgets/cslider"; parts { part { name: "background"; diff --git a/data/themes/default_desklock.edc b/data/themes/default_desklock.edc index 4fc75e0ab..4509ff300 100644 --- a/data/themes/default_desklock.edc +++ b/data/themes/default_desklock.edc @@ -7,7 +7,7 @@ images { } group { - name, "desklock/background"; + name, "e/desklock/background"; parts { part { name: "background_image"; @@ -37,7 +37,7 @@ group { } group { - name, "desklock/login_box"; + name, "e/desklock/login_box"; parts { part diff --git a/data/themes/default_dialog.edc b/data/themes/default_dialog.edc index 787b3dfff..2d3486e59 100644 --- a/data/themes/default_dialog.edc +++ b/data/themes/default_dialog.edc @@ -16,7 +16,7 @@ styles } group { - name: "widgets/dialog/main"; + name: "e/widgets/dialog/main"; parts { part { name: "base"; @@ -162,7 +162,7 @@ group { } group { - name: "widgets/dialog/text"; + name: "e/widgets/dialog/text"; parts { part { name: "e.textblock.message"; diff --git a/data/themes/default_entry.edc b/data/themes/default_entry.edc index b60606021..b49257d92 100644 --- a/data/themes/default_entry.edc +++ b/data/themes/default_entry.edc @@ -3,7 +3,7 @@ images { } group { - name: "widgets/entry"; + name: "e/widgets/entry"; min: 18 18; parts { part { @@ -77,7 +77,7 @@ group { } group { - name: "widgets/entry/text"; + name: "e/widgets/entry/text"; parts { part { name: "e.text.text"; @@ -100,7 +100,7 @@ group { } group { - name: "widgets/entry/cursor"; + name: "e/widgets/entry/cursor"; min: 1 0; parts { part { @@ -156,7 +156,7 @@ group { } group { - name: "widgets/entry/selection"; + name: "e/widgets/entry/selection"; data { item: "on_foreground" "1"; } diff --git a/data/themes/default_error.edc b/data/themes/default_error.edc index 853728d48..1a818136a 100644 --- a/data/themes/default_error.edc +++ b/data/themes/default_error.edc @@ -7,7 +7,7 @@ images { styles { style { - name: "error_style"; + name: "e/error_style"; base: "font=Edje-Vera font_size=10 text_class=tb_plain align=left color=#000 style=shadow shadow_color=#ffffff80 wrap=word"; tag: "br" "\n"; @@ -16,7 +16,7 @@ styles } group { - name: "error/main"; + name: "e/error/main"; min: 400 200; max: 400 200; parts { diff --git a/data/themes/default_exebuf.edc b/data/themes/default_exebuf.edc index ce5d9c312..4b2388b57 100644 --- a/data/themes/default_exebuf.edc +++ b/data/themes/default_exebuf.edc @@ -12,7 +12,7 @@ images { } group { - name: "widgets/exebuf/main"; + name: "e/widgets/exebuf/main"; parts { part { name: "base"; @@ -353,7 +353,7 @@ group { } group { - name: "widgets/exebuf/item"; + name: "e/widgets/exebuf/item"; parts { part { name: "title_outline"; diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc index 8be251ec3..79977cc90 100644 --- a/data/themes/default_fileman.edc +++ b/data/themes/default_fileman.edc @@ -13,7 +13,7 @@ images { } group { - name: "fileman/list/fixed"; + name: "e/fileman/list/fixed"; parts { part { name: "base"; @@ -688,7 +688,7 @@ group { } group { - name: "fileman/list_odd/fixed"; + name: "e/fileman/list_odd/fixed"; parts { part { name: "base"; @@ -1363,7 +1363,7 @@ group { } group { - name: "fileman/list/variable"; + name: "e/fileman/list/variable"; parts { part { name: "base"; @@ -2037,7 +2037,7 @@ group { } group { - name: "fileman/list_odd/variable"; + name: "e/fileman/list_odd/variable"; parts { part { name: "base"; @@ -2712,7 +2712,7 @@ group { } group { - name: "fileman/icon/fixed"; + name: "e/fileman/icon/fixed"; parts { part { name: "icon_overlay"; @@ -2820,7 +2820,7 @@ group { } group { - name: "fileman/icon/variable"; + name: "e/fileman/icon/variable"; parts { part { name: "icon_overlay"; @@ -2928,7 +2928,7 @@ group { } group { - name: "fileman/overlay"; + name: "e/fileman/overlay"; parts { part { name: "busy"; @@ -3067,7 +3067,7 @@ group { #define FULL_SIZE_FILEMAN_BUTTON(TYPE) \ group { \ - name: "fileman/button/"TYPE; \ + name: "e/fileman/button/"TYPE; \ parts { \ part { \ name: "whole"; \ @@ -3091,7 +3091,7 @@ group { \ #define FILEMAN_ICON(TYPE) \ group { \ - name: "icons/fileman/"TYPE; \ + name: "e/icons/fileman/"TYPE; \ parts { \ part { \ name: "icon"; \ @@ -3134,7 +3134,7 @@ group { \ #define FILEMAN_ICON_CLICKABLE(TYPE) \ group { \ - name: "icons/fileman/"TYPE; \ + name: "e/icons/fileman/"TYPE; \ parts { \ part { \ name: "icon"; \ @@ -3271,7 +3271,7 @@ images styles { style { - name: "fileman_icon_style"; + name: "e/fileman_icon_style"; base: "font=Edje-Vera color=#000 style=shadow shadow_color=#cccccc font_size=10 align=center wrap=char"; tag: "br" "\n"; tag: "hilight" "+ font=Edje-Vera-Bold"; @@ -3280,7 +3280,7 @@ styles } group { - name: "fileman/smart"; + name: "e/fileman/smart"; parts { part { name: "background"; @@ -3305,7 +3305,7 @@ group { } } part { - name: "icons"; + name: "e/icons"; type: SWALLOW; description { state: "default" 0.0; @@ -3405,7 +3405,7 @@ group { } group { - name: "fileman/main"; + name: "e/fileman/main"; parts { part { name: "background_clip"; @@ -4170,7 +4170,7 @@ group { } group { - name: "fileman/icon_normal"; + name: "e/fileman/icon_normal"; parts { part { name: "icon_overlay"; @@ -4366,7 +4366,7 @@ group { group { - name: "fileman/icon_thumb"; + name: "e/fileman/icon_thumb"; parts { part { name: "icon_box_shadow"; @@ -4492,7 +4492,7 @@ group { group { - name: "fileman/icon_list"; + name: "e/fileman/icon_list"; parts { part { name: "e.swallow.icon"; @@ -4577,7 +4577,7 @@ group { } group { - name: "fileman/background"; + name: "e/fileman/background"; parts { part { name: "base"; @@ -4600,7 +4600,7 @@ group { } group { - name: "fileman/rubberband"; + name: "e/fileman/rubberband"; parts { part { name: "base"; diff --git a/data/themes/default_filesel.edc b/data/themes/default_filesel.edc index d374985a2..94cf48653 100644 --- a/data/themes/default_filesel.edc +++ b/data/themes/default_filesel.edc @@ -5,7 +5,7 @@ images { image: "e17_ibar_over_h.png" COMP; } group { - name: "widgets/fileselector/main"; + name: "e/widgets/fileselector/main"; parts { part { name: "background"; diff --git a/data/themes/default_frame.edc b/data/themes/default_frame.edc index 901fc9bba..6f7c22414 100644 --- a/data/themes/default_frame.edc +++ b/data/themes/default_frame.edc @@ -4,7 +4,7 @@ images { image: "e17_frame_outline.png" COMP; } group { - name: "widgets/frame"; + name: "e/widgets/frame"; parts { part { name: "e.swallow.content"; diff --git a/data/themes/default_gadman.edc b/data/themes/default_gadman.edc index 43f02ba64..f22569b1a 100644 --- a/data/themes/default_gadman.edc +++ b/data/themes/default_gadman.edc @@ -14,7 +14,7 @@ images { } group { - name: "gadman/control"; + name: "e/gadman/control"; parts { part { name: "hclip"; diff --git a/data/themes/default_ibar.edc b/data/themes/default_ibar.edc index 1ca6de2d4..ec7d87c30 100644 --- a/data/themes/default_ibar.edc +++ b/data/themes/default_ibar.edc @@ -7,7 +7,7 @@ images { } group { - name: "modules/ibar/icon"; + name: "e/modules/ibar/icon"; data { item: "raise_on_hilight" "0"; // 1 or 0 if u want an icon holder to raise when the mouse (or keyboard) hilights it // item: "item_list" "item item2 item3"; @@ -111,7 +111,7 @@ group { } group { - name: "modules/ibar/icon_overlay"; + name: "e/modules/ibar/icon_overlay"; data { // item: "item_list", "item item2 item3"; } @@ -328,7 +328,7 @@ group { } group { - name: "modules/ibar/drop"; + name: "e/modules/ibar/drop"; parts { part { name: "bg"; @@ -346,7 +346,7 @@ group { } group { - name: "modules/ibar/drop_overlay"; + name: "e/modules/ibar/drop_overlay"; parts { part { name: "l1"; diff --git a/data/themes/default_ibox.edc b/data/themes/default_ibox.edc index 0c8333fbd..2ce025d01 100644 --- a/data/themes/default_ibox.edc +++ b/data/themes/default_ibox.edc @@ -7,7 +7,7 @@ images { } group { - name: "modules/ibox/icon"; + name: "e/modules/ibox/icon"; data { item: "raise_on_hilight" "0"; // 1 or 0 if u want an icon holder to raise when the mouse (or keyboard) hilights it // item: "item_list" "item item2 item3"; @@ -111,7 +111,7 @@ group { } group { - name: "modules/ibox/icon_overlay"; + name: "e/modules/ibox/icon_overlay"; data { // item: "item_list", "item item2 item3"; } @@ -328,7 +328,7 @@ group { } group { - name: "modules/ibox/drop"; + name: "e/modules/ibox/drop"; parts { part { name: "bg"; @@ -346,7 +346,7 @@ group { } group { - name: "modules/ibox/drop_overlay"; + name: "e/modules/ibox/drop_overlay"; parts { part { name: "l1"; diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc index 84c897a29..922b61b3b 100644 --- a/data/themes/default_icons.edc +++ b/data/themes/default_icons.edc @@ -74,7 +74,7 @@ images { } group { - name: "icons/enlightenment/e"; + name: "e/icons/enlightenment/e"; max: 64 64; parts { part { @@ -135,7 +135,7 @@ group { } } group { - name: "icons/enlightenment/exit"; + name: "e/icons/enlightenment/exit"; max: 64 64; parts { part { @@ -196,7 +196,7 @@ group { } } group { - name: "icons/enlightenment/reset"; + name: "e/icons/enlightenment/reset"; max: 64 64; parts { part { @@ -257,11 +257,11 @@ group { } } group { - name: "icons/enlightenment/themes"; + name: "e/icons/enlightenment/themes"; max: 64 64; parts { part { - name: "theme_button"; + name: "e/theme_button"; mouse_events: 0; description { state: "default" 0.0; @@ -276,7 +276,7 @@ group { } } group { - name: "icons/enlightenment/windows"; + name: "e/icons/enlightenment/windows"; max: 64 64; parts { part { @@ -295,7 +295,7 @@ group { } } group { - name: "icons/enlightenment/lost_windows"; + name: "e/icons/enlightenment/lost_windows"; max: 64 64; parts { part { @@ -314,7 +314,7 @@ group { } } group { - name: "icons/enlightenment/focus"; + name: "e/icons/enlightenment/focus"; max: 64 64; parts { part { @@ -333,7 +333,7 @@ group { } } group { - name: "icons/enlightenment/modules"; + name: "e/icons/enlightenment/modules"; max: 64 64; parts { part { @@ -352,7 +352,7 @@ group { } } group { - name: "icons/enlightenment/favorites"; + name: "e/icons/enlightenment/favorites"; max: 64 64; parts { part { @@ -371,7 +371,7 @@ group { } } group { - name: "icons/enlightenment/desktops"; + name: "e/icons/enlightenment/desktops"; max: 64 64; parts { part { @@ -390,7 +390,7 @@ group { } } group { - name: "icons/enlightenment/gadgets"; + name: "e/icons/enlightenment/gadgets"; max: 64 64; parts { part { @@ -409,7 +409,7 @@ group { } } group { - name: "icons/enlightenment/configuration"; + name: "e/icons/enlightenment/configuration"; max: 64 64; parts { part { @@ -428,7 +428,7 @@ group { } } group { - name: "icons/enlightenment/run"; + name: "e/icons/enlightenment/run"; max: 64 64; parts { part { @@ -447,7 +447,7 @@ group { } } group { - name: "icons/enlightenment/fileman"; + name: "e/icons/enlightenment/fileman"; max: 64 64; parts { part { @@ -508,7 +508,7 @@ group { } } group { - name: "icons/enlightenment/unknown"; + name: "e/icons/enlightenment/unknown"; max: 64 64; parts { part { @@ -527,7 +527,7 @@ group { } } group { - name: "icons/widget/new_dialog"; + name: "e/icons/widget/new_dialog"; parts { part { name: "icon"; @@ -545,7 +545,7 @@ group { } } group { - name: "icons/widget/up_arrow"; + name: "e/icons/widget/up_arrow"; parts { part { name: "icon"; @@ -563,7 +563,7 @@ group { } } group { - name: "icons/widget/down_arrow"; + name: "e/icons/widget/down_arrow"; parts { part { name: "icon"; @@ -581,7 +581,7 @@ group { } } group { - name: "icons/widget/up_dir"; + name: "e/icons/widget/up_dir"; parts { part { name: "icon"; @@ -599,7 +599,7 @@ group { } } group { - name: "icons/enlightenment/mouse"; + name: "e/icons/enlightenment/mouse"; max: 64 64; parts { part { @@ -618,7 +618,7 @@ group { } } group { - name: "icons/enlightenment/keys"; + name: "e/icons/enlightenment/keys"; max: 64 64; parts { part { @@ -637,7 +637,7 @@ group { } } group { - name: "icons/enlightenment/desklock"; + name: "e/icons/enlightenment/desklock"; max: 64 64; parts { part { @@ -656,7 +656,7 @@ group { } } group { - name: "icons/enlightenment/screen_resolution"; + name: "e/icons/enlightenment/screen_resolution"; max: 64 64; parts { part { @@ -675,7 +675,7 @@ group { } } group { - name: "icons/enlightenment/shelf"; + name: "e/icons/enlightenment/shelf"; max: 64 64; parts { part { @@ -694,7 +694,7 @@ group { } } group { - name: "icons/enlightenment/fonts"; + name: "e/icons/enlightenment/fonts"; max: 64 64; parts { part { @@ -713,7 +713,7 @@ group { } } group { - name: "icons/enlightenment/background"; + name: "e/icons/enlightenment/background"; max: 64 64; parts { part { @@ -732,7 +732,7 @@ group { } } group { - name: "icons/enlightenment/screen_normal"; + name: "e/icons/enlightenment/screen_normal"; max: 24 24; parts { part { @@ -751,7 +751,7 @@ group { } } group { - name: "icons/enlightenment/screen_normal"; + name: "e/icons/enlightenment/screen_normal"; max: 24 24; parts { part { @@ -770,7 +770,7 @@ group { } } group { - name: "icons/enlightenment/screen_around"; + name: "e/icons/enlightenment/screen_around"; max: 24 24; parts { part { @@ -789,7 +789,7 @@ group { } } group { - name: "icons/enlightenment/screen_left"; + name: "e/icons/enlightenment/screen_left"; max: 24 24; parts { part { @@ -808,7 +808,7 @@ group { } } group { - name: "icons/enlightenment/screen_right"; + name: "e/icons/enlightenment/screen_right"; max: 24 24; parts { part { @@ -827,7 +827,7 @@ group { } } group { - name: "icons/enlightenment/screen_vflip"; + name: "e/icons/enlightenment/screen_vflip"; max: 24 24; parts { part { @@ -846,7 +846,7 @@ group { } } group { - name: "icons/enlightenment/screen_hflip"; + name: "e/icons/enlightenment/screen_hflip"; max: 24 24; parts { part { @@ -865,7 +865,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_bottom"; + name: "e/icons/enlightenment/shelf_position_bottom"; max: 24 24; parts { part { @@ -884,7 +884,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_bottom_left"; + name: "e/icons/enlightenment/shelf_position_bottom_left"; max: 24 24; parts { part { @@ -903,7 +903,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_bottom_right"; + name: "e/icons/enlightenment/shelf_position_bottom_right"; max: 24 24; parts { part { @@ -922,7 +922,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_top"; + name: "e/icons/enlightenment/shelf_position_top"; max: 24 24; parts { part { @@ -941,7 +941,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_top_left"; + name: "e/icons/enlightenment/shelf_position_top_left"; max: 24 24; parts { part { @@ -960,7 +960,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_top_right"; + name: "e/icons/enlightenment/shelf_position_top_right"; max: 24 24; parts { part { @@ -979,7 +979,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_left"; + name: "e/icons/enlightenment/shelf_position_left"; max: 24 24; parts { part { @@ -998,7 +998,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_left_top"; + name: "e/icons/enlightenment/shelf_position_left_top"; max: 24 24; parts { part { @@ -1017,7 +1017,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_left_bottom"; + name: "e/icons/enlightenment/shelf_position_left_bottom"; max: 24 24; parts { part { @@ -1036,7 +1036,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_right"; + name: "e/icons/enlightenment/shelf_position_right"; max: 24 24; parts { part { @@ -1055,7 +1055,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_right_top"; + name: "e/icons/enlightenment/shelf_position_right_top"; max: 24 24; parts { part { @@ -1074,7 +1074,7 @@ group { } } group { - name: "icons/enlightenment/shelf_position_right_bottom"; + name: "e/icons/enlightenment/shelf_position_right_bottom"; max: 24 24; parts { part { @@ -1093,7 +1093,7 @@ group { } } group { - name: "icons/enlightenment/shelf_bottom_desk"; + name: "e/icons/enlightenment/shelf_bottom_desk"; max: 24 24; parts { part { @@ -1112,7 +1112,7 @@ group { } } group { - name: "icons/enlightenment/shelf_custom"; + name: "e/icons/enlightenment/shelf_custom"; max: 24 24; parts { part { @@ -1131,7 +1131,7 @@ group { } } group { - name: "icons/enlightenment/shelf_dock"; + name: "e/icons/enlightenment/shelf_dock"; max: 24 24; parts { part { @@ -1150,7 +1150,7 @@ group { } } group { - name: "icons/enlightenment/shelf_menu_bar"; + name: "e/icons/enlightenment/shelf_menu_bar"; max: 24 24; parts { part { @@ -1169,7 +1169,7 @@ group { } } group { - name: "icons/enlightenment/shelf_panel"; + name: "e/icons/enlightenment/shelf_panel"; max: 24 24; parts { part { @@ -1188,7 +1188,7 @@ group { } } group { - name: "icons/enlightenment/shelf_top_desk"; + name: "e/icons/enlightenment/shelf_top_desk"; max: 24 24; parts { part { @@ -1208,7 +1208,7 @@ group { } group { - name: "icons/enlightenment/wallpaper_stretch"; + name: "e/icons/enlightenment/wallpaper_stretch"; max: 24 24; parts { part { @@ -1245,7 +1245,7 @@ group { } group { - name: "icons/enlightenment/wallpaper_tile"; + name: "e/icons/enlightenment/wallpaper_tile"; max: 24 24; parts { part { @@ -1287,7 +1287,7 @@ group { } group { - name: "icons/enlightenment/wallpaper_center"; + name: "e/icons/enlightenment/wallpaper_center"; max: 24 24; parts { part { @@ -1330,7 +1330,7 @@ group { } group { - name: "icons/enlightenment/wallpaper_scale_aspect_in"; + name: "e/icons/enlightenment/wallpaper_scale_aspect_in"; max: 24 24; parts { part { @@ -1369,7 +1369,7 @@ group { } group { - name: "icons/enlightenment/wallpaper_scale_aspect_out"; + name: "e/icons/enlightenment/wallpaper_scale_aspect_out"; max: 24 24; parts { part { @@ -1408,7 +1408,7 @@ group { } group { - name: "icons/enlightenment/gradient_h"; + name: "e/icons/enlightenment/gradient_h"; max: 24 24; parts { part { @@ -1450,7 +1450,7 @@ group { } group { - name: "icons/enlightenment/gradient_v"; + name: "e/icons/enlightenment/gradient_v"; max: 24 24; parts { part { @@ -1488,7 +1488,7 @@ group { } group { - name: "icons/enlightenment/gradient_du"; + name: "e/icons/enlightenment/gradient_du"; max: 24 24; parts { part { @@ -1530,7 +1530,7 @@ group { } group { - name: "icons/enlightenment/gradient_dd"; + name: "e/icons/enlightenment/gradient_dd"; max: 24 24; parts { part { @@ -1572,7 +1572,7 @@ group { } group { - name: "icons/enlightenment/gradient_rad"; + name: "e/icons/enlightenment/gradient_rad"; max: 24 24; parts { part { diff --git a/data/themes/default_ilist.edc b/data/themes/default_ilist.edc index 4b93b82cc..a5263bc03 100644 --- a/data/themes/default_ilist.edc +++ b/data/themes/default_ilist.edc @@ -3,7 +3,7 @@ images { image: "e17_ilist_bg1.png" COMP; } group { - name: "widgets/ilist"; + name: "e/widgets/ilist"; parts { part { name: "base"; @@ -470,7 +470,7 @@ group { } group { - name: "widgets/ilist_odd"; + name: "e/widgets/ilist_odd"; parts { part { name: "base"; @@ -937,7 +937,7 @@ group { } group { - name: "widgets/ilist_header"; + name: "e/widgets/ilist_header"; parts { part { name: "base"; diff --git a/data/themes/default_label.edc b/data/themes/default_label.edc index d50a35b78..562f7838b 100644 --- a/data/themes/default_label.edc +++ b/data/themes/default_label.edc @@ -1,5 +1,5 @@ group { - name: "widgets/label"; + name: "e/widgets/label"; parts { part { name: "e.text.label"; diff --git a/data/themes/default_menu.edc b/data/themes/default_menu.edc index 6ea9dfc03..b72523636 100644 --- a/data/themes/default_menu.edc +++ b/data/themes/default_menu.edc @@ -9,7 +9,7 @@ images { image: "e17_menu_separator.png" COMP; } group { - name: "widgets/menu/default/background"; + name: "e/widgets/menu/default/background"; data { // this tells e the border is shaped // item: "shaped" "1"; @@ -163,7 +163,7 @@ group { } } group { - name: "widgets/menu/default/separator"; + name: "e/widgets/menu/default/separator"; parts { part { name: "separator"; @@ -191,7 +191,7 @@ group { } } group { - name: "widgets/menu/default/item_bg"; + name: "e/widgets/menu/default/item_bg"; parts { part { name: "e.swallow.content"; @@ -212,7 +212,7 @@ group { } } group { - name: "widgets/menu/default/submenu_bg"; + name: "e/widgets/menu/default/submenu_bg"; parts { part { name: "e.swallow.content"; @@ -233,7 +233,7 @@ group { } } group { - name: "widgets/menu/default/check"; + name: "e/widgets/menu/default/check"; parts { part { name: "outline"; @@ -316,7 +316,7 @@ group { } } group { - name: "widgets/menu/default/radio"; + name: "e/widgets/menu/default/radio"; parts { part { name: "outline"; @@ -399,7 +399,7 @@ group { } } group { - name: "widgets/menu/default/icon"; + name: "e/widgets/menu/default/icon"; parts { part { name: "e.swallow.content"; @@ -419,7 +419,7 @@ group { } } group { - name: "widgets/menu/default/label"; + name: "e/widgets/menu/default/label"; parts { part { name: "title_outline"; @@ -913,7 +913,7 @@ group { } } group { - name: "widgets/menu/default/submenu"; + name: "e/widgets/menu/default/submenu"; parts { part { name: "arrow"; diff --git a/data/themes/default_move.edc b/data/themes/default_move.edc index b86dc3b39..f3da4d3e1 100644 --- a/data/themes/default_move.edc +++ b/data/themes/default_move.edc @@ -2,7 +2,7 @@ images { image: "e17_menu_bg.png" COMP; } group { - name: "widgets/border/default/move"; + name: "e/widgets/border/default/move"; parts { part { name: "base"; diff --git a/data/themes/default_pager.edc b/data/themes/default_pager.edc index 80d4f464b..ca8a411e7 100644 --- a/data/themes/default_pager.edc +++ b/data/themes/default_pager.edc @@ -10,7 +10,7 @@ images { } group { - name: "widgets/pager/popup"; + name: "e/widgets/pager/popup"; parts { part { name: "base"; @@ -233,7 +233,7 @@ group { } group { - name: "modules/pager/desk"; + name: "e/modules/pager/desk"; script { public active; public drag; @@ -618,7 +618,7 @@ group { } group { - name: "modules/pager/window"; + name: "e/modules/pager/window"; parts { part { name: "overlay"; diff --git a/data/themes/default_pointer.edc b/data/themes/default_pointer.edc index 79d595721..a3eb9463a 100644 --- a/data/themes/default_pointer.edc +++ b/data/themes/default_pointer.edc @@ -4,10 +4,10 @@ images { } group { - name: "pointer/enlightenment/default/color"; + name: "e/pointer/enlightenment/default/color"; parts { part { - name: "pointer"; + name: "e/pointer"; type: IMAGE; mouse_events: 0; description { @@ -73,10 +73,10 @@ group { } group { - name: "pointer/enlightenment/default/mono"; + name: "e/pointer/enlightenment/default/mono"; parts { part { - name: "pointer"; + name: "e/pointer"; type: IMAGE; mouse_events: 0; description { diff --git a/data/themes/default_preview.edc b/data/themes/default_preview.edc index 55a8f2f0d..8ba6be0a9 100644 --- a/data/themes/default_preview.edc +++ b/data/themes/default_preview.edc @@ -4,7 +4,7 @@ images { } group { - name: "widgets/preview"; + name: "e/widgets/preview"; parts { part { name: "bg"; diff --git a/data/themes/default_radio.edc b/data/themes/default_radio.edc index 1fe6f8c79..122c8b2c6 100644 --- a/data/themes/default_radio.edc +++ b/data/themes/default_radio.edc @@ -5,7 +5,7 @@ images { image: "focus.png" COMP; } group { - name: "widgets/radio"; + name: "e/widgets/radio"; parts { part { name: "outline"; @@ -193,7 +193,7 @@ group { } group { - name: "widgets/radio_icon"; + name: "e/widgets/radio_icon"; parts { part { name: "outline"; diff --git a/data/themes/default_resize.edc b/data/themes/default_resize.edc index 5039c554a..3c263cb40 100644 --- a/data/themes/default_resize.edc +++ b/data/themes/default_resize.edc @@ -2,7 +2,7 @@ images { image: "e17_menu_bg.png" COMP; } group { - name: "widgets/border/default/resize"; + name: "e/widgets/border/default/resize"; parts { part { name: "base"; diff --git a/data/themes/default_scrollframe.edc b/data/themes/default_scrollframe.edc index db993f44d..db6ed7b1a 100644 --- a/data/themes/default_scrollframe.edc +++ b/data/themes/default_scrollframe.edc @@ -22,7 +22,7 @@ images { } group { - name: "widgets/scrollframe"; + name: "e/widgets/scrollframe"; parts { part { name: "bg"; diff --git a/data/themes/default_shelf.edc b/data/themes/default_shelf.edc index 3a0c75a5e..64328a914 100644 --- a/data/themes/default_shelf.edc +++ b/data/themes/default_shelf.edc @@ -8,7 +8,7 @@ images { } group { - name: "shelf/default/base"; + name: "e/shelf/default/base"; data { // this tells e the border is shaped item: "shaped" "1"; @@ -421,7 +421,7 @@ group { } } group { - name: "shelf/default/inset"; + name: "e/shelf/default/inset"; parts { part { name: "background"; @@ -517,7 +517,7 @@ group { group { - name: "shelf/gold/base"; + name: "e/shelf/gold/base"; data { // this tells e the border is shaped item: "shaped" "1"; @@ -930,7 +930,7 @@ group { } } group { - name: "shelf/gold/inset"; + name: "e/shelf/gold/inset"; parts { part { name: "background"; @@ -1017,7 +1017,7 @@ group { group { - name: "shelf/invisible/base"; + name: "e/shelf/invisible/base"; data { // this tells e the border is shaped item: "shaped" "1"; @@ -1034,7 +1034,7 @@ group { } } group { - name: "shelf/invisible/inset"; + name: "e/shelf/invisible/inset"; parts { part { name: "background"; diff --git a/data/themes/default_slider.edc b/data/themes/default_slider.edc index e2a8b5d65..b8355e171 100644 --- a/data/themes/default_slider.edc +++ b/data/themes/default_slider.edc @@ -10,7 +10,7 @@ images { } group { - name: "widgets/slider_vertical"; + name: "e/widgets/slider_vertical"; parts { part { name: "sld_base"; @@ -420,7 +420,7 @@ group { } group { - name: "widgets/slider_horizontal"; + name: "e/widgets/slider_horizontal"; parts { part { name: "sld_base"; diff --git a/data/themes/default_spectrum.edc b/data/themes/default_spectrum.edc index eca0f1d9a..bb0b3cca2 100644 --- a/data/themes/default_spectrum.edc +++ b/data/themes/default_spectrum.edc @@ -3,7 +3,7 @@ images { } group { - name: "widgets/spectrum"; + name: "e/widgets/spectrum"; parts { part { name: "background"; @@ -46,7 +46,7 @@ group { } } part { - name: "content"; + name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "content_clip"; @@ -66,7 +66,7 @@ group { name: "e.dragable.cursor"; type: RECT; dragable { - confine: "content"; + confine: "e.swallow.content"; x: 1 1 0; y: 1 1 0; } @@ -77,12 +77,12 @@ group { fixed: 1 1; visible: 0; rel1 { - to: "content"; + to: "e.swallow.content"; relative: 0.5 0.5; offset: 0 0; } rel2 { - to: "content"; + to: "e.swallow.content"; relative: 0.5 0.5; offset: 0 0; } @@ -95,11 +95,11 @@ group { state: "default" 0.0; rel1 { to_x: "e.dragable.cursor"; - to_y: "content"; + to_y: "e.swallow.content"; } rel2 { to_x: "e.dragable.cursor"; - to_y: "content"; + to_y: "e.swallow.content"; } } @@ -110,11 +110,11 @@ group { description { state: "default" 0.0; rel1 { - to_x: "content"; + to_x: "e.swallow.content"; to_y: "e.dragable.cursor"; } rel2 { - to_x: "content"; + to_x: "e.swallow.content"; to_y: "e.dragable.cursor"; } diff --git a/data/themes/default_start.edc b/data/themes/default_start.edc index c7fbd8119..26a91f014 100644 --- a/data/themes/default_start.edc +++ b/data/themes/default_start.edc @@ -1,5 +1,5 @@ group { - name: "modules/start/main"; + name: "e/modules/start/main"; max: 128 128; script { public is_active; diff --git a/data/themes/default_temperature.edc b/data/themes/default_temperature.edc index fa71187c6..10efe4827 100644 --- a/data/themes/default_temperature.edc +++ b/data/themes/default_temperature.edc @@ -4,7 +4,7 @@ images { image: "e17_temperature_overlay.png" COMP; } group { - name: "modules/temperature/main"; + name: "e/modules/temperature/main"; max: 128 128; script { public message(Msg_Type:type, id, ...) { diff --git a/data/themes/default_textblock.edc b/data/themes/default_textblock.edc index 93764e441..0f7bce2e1 100644 --- a/data/themes/default_textblock.edc +++ b/data/themes/default_textblock.edc @@ -12,7 +12,7 @@ styles } group { - name: "widgets/textblock"; + name: "e/widgets/textblock"; parts { part { name: "e.textblock.text"; diff --git a/data/themes/default_theme_about.edc b/data/themes/default_theme_about.edc index 28cec80aa..d3520d1d5 100644 --- a/data/themes/default_theme_about.edc +++ b/data/themes/default_theme_about.edc @@ -14,7 +14,7 @@ images { styles { style { - name: "theme_about_style"; + name: "e/theme_about_style"; base: "font=Edje-Vera style=glow color=#fff glow2_color=#fe87 glow_color=#fa14 font_size=12 align=center wrap=word"; tag: "br" "\n"; @@ -24,7 +24,7 @@ styles } group { - name: "theme/about"; + name: "e/theme/about"; min: 400 160; max: 400 160; parts { diff --git a/data/themes/default_tlist.edc b/data/themes/default_tlist.edc index 085be89ac..c529e7618 100644 --- a/data/themes/default_tlist.edc +++ b/data/themes/default_tlist.edc @@ -17,7 +17,7 @@ styles } group { - name: "widgets/tlist"; + name: "e/widgets/tlist"; parts { part { name: "base"; @@ -490,7 +490,7 @@ group { } group { - name: "widgets/tlist_odd"; + name: "e/widgets/tlist_odd"; parts { part { name: "base"; diff --git a/data/themes/default_transitions.edc b/data/themes/default_transitions.edc index e3c47c29d..6c4b2fd9e 100644 --- a/data/themes/default_transitions.edc +++ b/data/themes/default_transitions.edc @@ -3,7 +3,7 @@ images { } group { - name: "transitions/crossfade"; + name: "e/transitions/crossfade"; parts { part { name: "e.swallow.bg.old"; @@ -55,7 +55,7 @@ group { } group { - name: "transitions/vswipe"; + name: "e/transitions/vswipe"; parts { part { name: "e.swallow.bg.old"; diff --git a/data/themes/default_winlist.edc b/data/themes/default_winlist.edc index 11b100b84..126a6dab2 100644 --- a/data/themes/default_winlist.edc +++ b/data/themes/default_winlist.edc @@ -11,7 +11,7 @@ images { } group { - name: "widgets/winlist/main"; + name: "e/widgets/winlist/main"; parts { part { name: "base"; @@ -312,7 +312,7 @@ group { group { - name: "widgets/winlist/item"; + name: "e/widgets/winlist/item"; parts { part { name: "title_outline"; diff --git a/src/bin/e_about.c b/src/bin/e_about.c index 451cd47e8..dc48df709 100644 --- a/src/bin/e_about.c +++ b/src/bin/e_about.c @@ -44,7 +44,7 @@ e_about_new(E_Container *con) o = edje_object_add(e_win_evas_get(about->win)); about->bg_object = o; e_theme_edje_object_set(o, "base/theme/about", - "widgets/about/main"); + "e/widgets/about/main"); evas_object_move(o, 0, 0); evas_object_show(o); diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c index 4524f6be5..d1e64220d 100644 --- a/src/bin/e_bg.c +++ b/src/bin/e_bg.c @@ -41,7 +41,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) { for (ll = entries; ll; ll = ll->next) { - if (!strcmp(ll->data, "desktop/background")) + if (!strcmp(ll->data, "e/desktop/background")) { bgfile = cfbg->file; ok = 1; @@ -59,7 +59,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) { for (ll = entries; ll; ll = ll->next) { - if (!strcmp(ll->data, "desktop/background")) + if (!strcmp(ll->data, "e/desktop/background")) { bgfile = e_config->desktop_default_background; ok = 1; @@ -70,7 +70,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) } if (!ok) { - bgfile = e_theme_edje_file_get("base/theme/background", "desktop/background"); + bgfile = e_theme_edje_file_get("base/theme/background", "e/desktop/background"); } } if (zone->bg_object) @@ -107,7 +107,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) o = edje_object_add(zone->container->bg_evas); zone->transition_object = o; evas_object_data_set(o, "e_zone", zone); - snprintf(buf, sizeof(buf), "transitions/%s", trans); + snprintf(buf, sizeof(buf), "e/transitions/%s", trans); e_theme_edje_object_set(o, "base/theme/transitions", buf); edje_object_signal_callback_add(o, "e,state,done", "*", _e_bg_signal, zone); evas_object_move(o, zone->x, zone->y); @@ -121,7 +121,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) evas_object_data_set(o, "e_zone", zone); evas_object_move(o, zone->x, zone->y); evas_object_resize(o, zone->w, zone->h); - edje_object_file_set(o, bgfile, "desktop/background"); + edje_object_file_set(o, bgfile, "e/desktop/background"); evas_object_layer_set(o, -1); evas_object_clip_set(o, zone->bg_clip_object); evas_object_show(o); diff --git a/src/bin/e_border.c b/src/bin/e_border.c index c92f3eaba..253d75b0b 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -5393,12 +5393,12 @@ _e_border_eval(E_Border *bd) evas_object_del(bd->bg_object); } o = edje_object_add(bd->bg_evas); - snprintf(buf, sizeof(buf), "widgets/border/%s/border", + snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name); ok = e_theme_edje_object_set(o, "base/theme/borders", buf); if ((!ok) && (strcmp(bd->client.border.name, "borderless"))) ok = e_theme_edje_object_set(o, "base/theme/borders", - "widgets/border/default/border"); + "e/widgets/border/default/border"); if (ok) { const char *shape_option; diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 637a6c88c..d8b56b9f3 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -52,7 +52,7 @@ e_configure_show(E_Container *con) eco->edje = edje_object_add(eco->evas); e_theme_edje_object_set(eco->edje, "base/theme/configure", - "widgets/configure/main"); + "e/widgets/configure/main"); /* 24 */ eco->ilist = e_widget_ilist_add(eco->evas, 32, 32, NULL); diff --git a/src/bin/e_container.c b/src/bin/e_container.c index eaceba850..35683bdac 100644 --- a/src/bin/e_container.c +++ b/src/bin/e_container.c @@ -109,7 +109,7 @@ e_container_new(E_Manager *man) evas_object_move(o, 0, 0); evas_object_resize(o, con->w, con->h); evas_object_color_set(o, 255, 255, 255, 255); - evas_object_name_set(o, "desktop/background"); + evas_object_name_set(o, "e/desktop/background"); evas_object_data_set(o, "e_container", con); evas_object_show(o); diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index fbab3e674..9b0164998 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -218,32 +218,32 @@ e_desklock_show(void) { e_theme_edje_object_set(edp->bg_object, "base/theme/desklock", - "desklock/background"); + "e/desklock/background"); } else if (!strcmp(e_config->desklock_background, "theme_background")) { e_theme_edje_object_set(edp->bg_object, "base/theme/backgrounds", - "desktop/background"); + "e/desktop/background"); } else { if (e_util_edje_collection_exists(e_config->desklock_background, - "desklock/background")) + "e/desklock/background")) { edje_object_file_set(edp->bg_object, e_config->desklock_background, - "desklock/background"); + "e/desklock/background"); } else { if (!edje_object_file_set(edp->bg_object, e_config->desklock_background, - "desktop/background")) + "e/desktop/background")) { edje_object_file_set(edp->bg_object, e_theme_edje_file_get("base/theme/desklock", - "desklock/background"), - "desklock/background"); + "e/desklock/background"), + "e/desklock/background"); } } } @@ -254,7 +254,7 @@ e_desklock_show(void) edp->login_box = edje_object_add(edp->popup_wnd->evas); e_theme_edje_object_set(edp->login_box, "base/theme/desklock", - "desklock/login_box"); + "e/desklock/login_box"); edje_object_part_text_set(edp->login_box, "e.text.title", _("Please enter your unlock password")); edje_object_part_swallow(edp->bg_object, "e.swallow.login_box", edp->login_box); diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c index 1cad7a147..2e3273161 100644 --- a/src/bin/e_dialog.c +++ b/src/bin/e_dialog.c @@ -47,7 +47,7 @@ e_dialog_new(E_Container *con, const char *name, const char *class) o = edje_object_add(e_win_evas_get(dia->win)); dia->bg_object = o; e_theme_edje_object_set(o, "base/theme/dialog", - "widgets/dialog/main"); + "e/widgets/dialog/main"); evas_object_move(o, 0, 0); evas_object_show(o); @@ -132,7 +132,7 @@ e_dialog_text_set(E_Dialog *dia, const char *text) o = edje_object_add(e_win_evas_get(dia->win)); dia->text_object = o; e_theme_edje_object_set(o, "base/theme/dialog", - "widgets/dialog/text"); + "e/widgets/dialog/text"); edje_object_part_swallow(dia->bg_object, "e.swallow.content", o); evas_object_show(o); } diff --git a/src/bin/e_entry.c b/src/bin/e_entry.c index c16e7faff..e4b2fd306 100644 --- a/src/bin/e_entry.c +++ b/src/bin/e_entry.c @@ -555,12 +555,12 @@ static void _e_entry_smart_add(Evas_Object *object) o = edje_object_add(evas); sd->entry_object = o; - e_theme_edje_object_set(o, "base/theme/widgets", "widgets/entry"); + e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/entry"); evas_object_smart_member_add(o, object); o = e_editable_add(evas); sd->editable_object = o; - e_editable_theme_set(o, "base/theme/widgets", "widgets/entry"); + e_editable_theme_set(o, "base/theme/widgets", "e/widgets/entry"); e_editable_cursor_hide(o); e_editable_char_size_get(o, &cw, &ch); edje_extern_object_min_size_set(o, cw, ch); diff --git a/src/bin/e_error.c b/src/bin/e_error.c index 06eefcf3b..a3111476b 100644 --- a/src/bin/e_error.c +++ b/src/bin/e_error.c @@ -83,7 +83,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt) e = ecore_evas_get(ee); o = edje_object_add(e); - if (!e_theme_edje_object_set(o, "base/theme/error", "error/main")) + if (!e_theme_edje_object_set(o, "base/theme/error", "e/error/main")) { Evas_Coord tw, th; char *newstr; diff --git a/src/bin/e_exebuf.c b/src/bin/e_exebuf.c index 9b526711f..32a698daf 100644 --- a/src/bin/e_exebuf.c +++ b/src/bin/e_exebuf.c @@ -167,7 +167,7 @@ e_exebuf_show(E_Zone *zone) o = edje_object_add(exebuf->evas); bg_object = o; e_theme_edje_object_set(o, "base/theme/exebuf", - "widgets/exebuf/main"); + "e/widgets/exebuf/main"); edje_object_part_text_set(o, "e.text.label", cmd_buf); o = e_box_add(exebuf->evas); @@ -879,7 +879,7 @@ _e_exebuf_matches_update(void) o = edje_object_add(exebuf->evas); exe->bg_object = o; e_theme_edje_object_set(o, "base/theme/exebuf", - "widgets/exebuf/item"); + "e/widgets/exebuf/item"); if (e_config->menu_eap_name_show && exe->app->name) opt |= 0x4; if (e_config->menu_eap_generic_show && exe->app->generic) opt |= 0x2; if (e_config->menu_eap_comment_show && exe->app->comment) opt |= 0x1; @@ -931,7 +931,7 @@ _e_exebuf_matches_update(void) o = edje_object_add(exebuf->evas); exe->bg_object = o; e_theme_edje_object_set(o, "base/theme/exebuf", - "widgets/exebuf/item"); + "e/widgets/exebuf/item"); edje_object_part_text_set(o, "e.text.title", exe->file); evas_object_show(o); if (edje_object_part_exists(exe->bg_object, "e.swallow.icons")) diff --git a/src/bin/e_file_dialog.c b/src/bin/e_file_dialog.c index 6dfd35ff9..6a79bc96f 100644 --- a/src/bin/e_file_dialog.c +++ b/src/bin/e_file_dialog.c @@ -57,9 +57,9 @@ e_file_dialog_new(E_Container *con) list = e_widget_framelist_add(evas, _("Places"), 0); e_widget_framelist_content_align_set(list, 0.5, 0.0); - e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Home"), "fileman/home", _cb_home, fm, NULL)); - e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Desktop"), "fileman/desktop", _cb_desktop, fm, NULL)); - e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Icons"), "fileman/folder", _cb_icons, fm, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Home"), "e/fileman/home", _cb_home, fm, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Desktop"), "e/fileman/desktop", _cb_desktop, fm, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Icons"), "e/fileman/folder", _cb_icons, fm, NULL)); e_widget_list_object_append(ol, list, 1, 0, 0.0); e_widget_list_object_append(ol, fm, 1, 1, 0.0); diff --git a/src/bin/e_fileman.c b/src/bin/e_fileman.c index d710908bc..646db6e68 100644 --- a/src/bin/e_fileman.c +++ b/src/bin/e_fileman.c @@ -137,7 +137,7 @@ e_fileman_new_to_dir(E_Container *con, char *path) fileman->main = e_scrollframe_add(fileman->evas); e_scrollframe_custom_theme_set(fileman->main, "base/themes/fileman", - "fileman/main"); + "e/fileman/main"); e_scrollframe_extern_pan_set(fileman->main, fileman->smart, _e_fileman_scroll_set, _e_fileman_scroll_get, diff --git a/src/bin/e_fileman_file.c b/src/bin/e_fileman_file.c index 33a16352a..3e6e27834 100644 --- a/src/bin/e_fileman_file.c +++ b/src/bin/e_fileman_file.c @@ -209,7 +209,7 @@ e_fm_file_is_etheme(E_Fm_File *file) for (l = groups; l; l = l->next) { - if (!strcmp(l->data, "widgets/border/default/border")) + if (!strcmp(l->data, "e/widgets/border/default/border")) { val = 1; break; @@ -235,7 +235,7 @@ e_fm_file_is_ebg(E_Fm_File *file) for (l = groups; l; l = l->next) { - if (!strcmp(l->data, "desktop/background")) + if (!strcmp(l->data, "e/desktop/background")) { val = 1; break; diff --git a/src/bin/e_fileman_icon.c b/src/bin/e_fileman_icon.c index 24ece0f1c..f463c8fc1 100644 --- a/src/bin/e_fileman_icon.c +++ b/src/bin/e_fileman_icon.c @@ -150,7 +150,7 @@ e_fm_icon_file_set(Evas_Object *obj, E_Fm_File *file) evas_object_show(sd->thumb_object); sd->image_object = edje_object_add(sd->evas); e_theme_edje_object_set(sd->image_object, "base/theme/fileman", - "fileman/icon_thumb"); + "e/fileman/icon_thumb"); edje_extern_object_min_size_set(sd->thumb_object, sd->iw, sd->ih); edje_extern_object_max_size_set(sd->thumb_object, sd->iw, sd->ih); edje_object_part_swallow(sd->image_object, "icon_swallow", @@ -483,9 +483,9 @@ _e_fm_icon_icon_mime_get(E_Smart_Data *sd) sd->image_object = edje_object_add(sd->evas); /* since a mime is set with every creation of an E_Fm_File its existence isnt checked here */ - snprintf(part, PATH_MAX, "icons/fileman/%s", (sd->file->mime->name)); + snprintf(part, PATH_MAX, "e/icons/fileman/%s", (sd->file->mime->name)); if (!e_theme_edje_object_set(sd->image_object, "base/theme/fileman", part)) - e_theme_edje_object_set(sd->image_object, "base/theme/fileman", "icons/fileman/file"); + e_theme_edje_object_set(sd->image_object, "base/theme/fileman", "e/icons/fileman/file"); evas_object_show(sd->image_object); edje_extern_object_min_size_set(sd->image_object, sd->iw, sd->ih); @@ -501,17 +501,17 @@ _e_fm_icon_type_set(E_Smart_Data *sd) { case E_FM_ICON_NORMAL: e_theme_edje_object_set(sd->icon_object, "base/theme/fileman", - "fileman/icon_normal"); + "e/fileman/icon_normal"); break; case E_FM_ICON_LIST: e_theme_edje_object_set(sd->icon_object, "base/theme/fileman", - "fileman/icon_list"); + "e/fileman/icon_list"); break; default: e_theme_edje_object_set(sd->icon_object, "base/theme/fileman", - "fileman/icon_normal"); + "e/fileman/icon_normal"); break; } diff --git a/src/bin/e_fileman_smart.c b/src/bin/e_fileman_smart.c index 76f055662..01bd0febd 100644 --- a/src/bin/e_fileman_smart.c +++ b/src/bin/e_fileman_smart.c @@ -586,7 +586,7 @@ _e_fm_smart_add(Evas_Object *object) evas_object_repeat_events_set(sd->edje_obj, 1); e_theme_edje_object_set(sd->edje_obj, "base/theme/fileman", - "fileman/smart"); + "e/fileman/smart"); evas_object_smart_member_add(sd->edje_obj, object); evas_object_show(sd->edje_obj); @@ -622,7 +622,7 @@ _e_fm_smart_add(Evas_Object *object) evas_object_smart_member_add(sd->selection.band.obj, object); e_theme_edje_object_set(sd->selection.band.obj, "base/theme/fileman/rubberband", - "fileman/rubberband"); + "e/fileman/rubberband"); evas_object_focus_set(sd->object, 1); evas_object_event_callback_add(sd->object, EVAS_CALLBACK_KEY_DOWN, _e_fm_key_down_cb, sd); @@ -1929,8 +1929,8 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) if (!sd->win) break; mn = e_menu_new(); - e_menu_category_set(mn,"fileman/unknown"); - e_menu_category_data_set("fileman/unknown",sd); + e_menu_category_set(mn,"e/fileman/unknown"); + e_menu_category_data_set("e/fileman/unknown",sd); sd->menu = mn; @@ -1939,12 +1939,12 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_label_set(mi, _("Arrange Icons")); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/arrange"), - "fileman/button/arrange"); + "e/fileman/button/arrange"), + "e/fileman/button/arrange"); mn = e_menu_new(); - e_menu_category_set(mn,"fileman/unknown/arrange"); - e_menu_category_data_set("fileman/unknown/arrange",sd); + e_menu_category_set(mn,"e/fileman/unknown/arrange"); + e_menu_category_data_set("e/fileman/unknown/arrange",sd); e_menu_item_submenu_set(mi, mn); mi = e_menu_item_new(mn); @@ -1955,8 +1955,8 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_callback_set(mi, _e_fm_menu_arrange_cb, sd); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/arrange_name"), - "fileman/button/arrange_name"); + "e/fileman/button/arrange_name"), + "e/fileman/button/arrange_name"); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("By Mod Time")); @@ -1966,19 +1966,19 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_callback_set(mi, _e_fm_menu_arrange_cb, sd); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/arrange_time"), - "fileman/button/arrange_time"); + "e/fileman/button/arrange_time"), + "e/fileman/button/arrange_time"); /*- New -*/ mi = e_menu_item_new(sd->menu); e_menu_item_label_set(mi, _("New")); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/new"), - "fileman/button/new"); + "e/fileman/button/new"), + "e/fileman/button/new"); mn = e_menu_new(); - e_menu_category_set(mn,"fileman/unknown/new"); - e_menu_category_data_set("fileman/unknown/new",sd); + e_menu_category_set(mn,"e/fileman/unknown/new"); + e_menu_category_data_set("e/fileman/unknown/new",sd); e_menu_item_submenu_set(mi, mn); mi = e_menu_item_new(mn); @@ -1986,19 +1986,19 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_callback_set(mi, _e_fm_menu_new_dir_cb, sd); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/new_dir"), - "fileman/button/new_dir"); + "e/fileman/button/new_dir"), + "e/fileman/button/new_dir"); /*- View -*/ mi = e_menu_item_new(sd->menu); e_menu_item_label_set(mi, _("View")); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/view"), - "fileman/button/view"); + "e/fileman/button/view"), + "e/fileman/button/view"); mn = e_menu_new(); - e_menu_category_set(mn,"fileman/unknown/view"); - e_menu_category_data_set("fileman/unknown/view",sd); + e_menu_category_set(mn,"e/fileman/unknown/view"); + e_menu_category_data_set("e/fileman/unknown/view",sd); e_menu_item_submenu_set(mi, mn); mi = e_menu_item_new(mn); @@ -2007,8 +2007,8 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_radio_group_set(mi, 2); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/view_name"), - "fileman/button/view_name"); + "e/fileman/button/view_name"), + "e/fileman/button/view_name"); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Details")); @@ -2016,8 +2016,8 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_radio_group_set(mi, 2); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/view_details"), - "fileman/button/view_details"); + "e/fileman/button/view_details"), + "e/fileman/button/view_details"); /*- Refresh -*/ mi = e_menu_item_new(sd->menu); @@ -2025,15 +2025,15 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_callback_set(mi, _e_fm_menu_refresh_cb, sd); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/refresh"), - "fileman/button/refresh"); + "e/fileman/button/refresh"), + "e/fileman/button/refresh"); /*- Properties -*/ mi = e_menu_item_new(sd->menu); e_menu_item_label_set(mi, _("Properties")); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/properties"), - "fileman/button/properties"); + "e/fileman/button/properties"), + "e/fileman/button/properties"); ecore_evas_geometry_get(sd->win->ecore_evas, &x, &y, &w, &h); @@ -3825,8 +3825,8 @@ _e_fm_menu_action_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, uns multiple = 1; mn = e_menu_new(); - e_menu_category_set(mn,"fileman/action"); - e_menu_category_data_set("fileman/action",sd); + e_menu_category_set(mn,"e/fileman/action"); + e_menu_category_data_set("e/fileman/action",sd); mi = NULL; default_action = NULL; @@ -3859,7 +3859,7 @@ _e_fm_menu_action_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, uns e_menu_item_label_set(mi, _(action->label)); e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/open"),"fileman/button/open"); + "e/fileman/button/open"),"fileman/button/open"); mi = e_menu_item_new(mn); e_menu_item_separator_set(mi, 1); @@ -3897,7 +3897,7 @@ _e_fm_menu_action_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, uns e_menu_item_label_set(mi, _(action->label)); e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/open"),"fileman/button/open"); + "e/fileman/button/open"),"fileman/button/open"); } mime = mime->parent; @@ -3911,15 +3911,15 @@ _e_fm_menu_action_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, uns //e_menu_item_callback_set(mi, _e_fm_file_menu_copy, icon); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/copy"), - "fileman/button/copy"); + "e/fileman/button/copy"), + "e/fileman/button/copy"); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Cut")); //e_menu_item_callback_set(mi, _e_fm_file_menu_cut, icon); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/cut"), - "fileman/button/cut"); + "e/fileman/button/cut"), + "e/fileman/button/cut"); mi = e_menu_item_new(mn); e_menu_item_separator_set(mi, 1); @@ -3930,8 +3930,8 @@ _e_fm_menu_action_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, uns //e_menu_item_callback_set(mi, _e_fm_file_menu_rename, icon); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/rename"), - "fileman/button/rename"); + "e/fileman/button/rename"), + "e/fileman/button/rename"); } mi = e_menu_item_new(mn); @@ -3939,8 +3939,8 @@ _e_fm_menu_action_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, uns //e_menu_item_callback_set(mi, _e_fm_file_menu_delete, icon); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/delete"), - "fileman/button/delete"); + "e/fileman/button/delete"), + "e/fileman/button/delete"); mi = e_menu_item_new(mn); @@ -3951,8 +3951,8 @@ _e_fm_menu_action_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, uns //e_menu_item_callback_set(mi, _e_fm_file_menu_properties, icon); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/properties"), - "fileman/button/properties"); + "e/fileman/button/properties"), + "e/fileman/button/properties"); sd->operation.menu = mn; if (!sd->win) return; @@ -3989,8 +3989,8 @@ _e_fm_menu_context_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, un multiple = 1; mn = e_menu_new(); - e_menu_category_set(mn,"fileman/action"); - e_menu_category_data_set("fileman/action",sd); + e_menu_category_set(mn,"e/fileman/action"); + e_menu_category_data_set("e/fileman/action",sd); mi = NULL; default_action = NULL; @@ -4022,7 +4022,7 @@ _e_fm_menu_context_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, un e_menu_item_label_set(mi, e_fm_mime_translate(sd, action->label)); e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/open"),"fileman/button/open"); + "e/fileman/button/open"),"fileman/button/open"); mi = e_menu_item_new(mn); e_menu_item_separator_set(mi, 1); @@ -4062,7 +4062,7 @@ _e_fm_menu_context_display(E_Fm_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy, un e_menu_item_label_set(mi, e_fm_mime_translate(sd, action->label)); e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", - "fileman/button/open"),"fileman/button/open"); + "e/fileman/button/open"),"fileman/button/open"); } mime = mime->parent; diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 8f3334625..c472a12f1 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -1242,7 +1242,7 @@ _e_fm2_icon_new(E_Fm2_Smart_Data *sd, char *file) { obj = edje_object_add(evas_object_evas_get(sd->obj)); e_theme_edje_object_set(obj, "base/theme/fileman", - "fileman/icon/variable"); + "e/fileman/icon/variable"); sd->tmp.obj = obj; } _e_fm2_icon_label_set(ic, obj); @@ -1263,10 +1263,10 @@ _e_fm2_icon_new(E_Fm2_Smart_Data *sd, char *file) obj = edje_object_add(evas_object_evas_get(sd->obj)); if (sd->config->icon.fixed.w) e_theme_edje_object_set(obj, "base/theme/fileman", - "fileman/list/fixed"); + "e/fileman/list/fixed"); else e_theme_edje_object_set(obj, "base/theme/fileman", - "fileman/list/variable"); + "e/fileman/list/variable"); sd->tmp.obj = obj; } _e_fm2_icon_label_set(ic, obj); @@ -1345,29 +1345,29 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic) { if (ic->odd) e_theme_edje_object_set(ic->obj, "base/theme/widgets", - "fileman/list_odd/fixed"); + "e/fileman/list_odd/fixed"); else e_theme_edje_object_set(ic->obj, "base/theme/widgets", - "fileman/list/fixed"); + "e/fileman/list/fixed"); } else { if (ic->odd) e_theme_edje_object_set(ic->obj, "base/theme/widgets", - "fileman/list_odd/variable"); + "e/fileman/list_odd/variable"); else e_theme_edje_object_set(ic->obj, "base/theme/widgets", - "fileman/list/variable"); + "e/fileman/list/variable"); } } else { if (ic->sd->config->icon.fixed.w) e_theme_edje_object_set(ic->obj, "base/theme/fileman", - "fileman/icon/fixed"); + "e/fileman/icon/fixed"); else e_theme_edje_object_set(ic->obj, "base/theme/fileman", - "fileman/icon/variable"); + "e/fileman/icon/variable"); } _e_fm2_icon_label_set(ic, ic->obj); evas_object_clip_set(ic->obj, ic->sd->clip); @@ -1509,12 +1509,12 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic) p = strchr(ic->info.mime, '/'); if (p) p++; else p = (char *)ic->info.mime; - snprintf(buf, sizeof(buf), "icons/fileman/%s", p); + snprintf(buf, sizeof(buf), "e/icons/fileman/%s", p); ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj)); if (!e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", buf)) e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", - "icons/fileman/file"); + "e/icons/fileman/file"); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon); evas_object_show(ic->obj_icon); } @@ -1525,7 +1525,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic) { ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj)); e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", - "icons/fileman/folder"); + "e/icons/fileman/folder"); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon); evas_object_show(ic->obj_icon); } @@ -1537,7 +1537,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic) { snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ic->info.file); ic->obj_icon = e_thumb_icon_add(evas_object_evas_get(ic->sd->obj)); - e_thumb_icon_file_set(ic->obj_icon, buf, "desktop/background"); + e_thumb_icon_file_set(ic->obj_icon, buf, "e/desktop/background"); e_thumb_icon_size_set(ic->obj_icon, 64, 48); evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic); _e_fm2_icon_thumb(ic); @@ -1561,7 +1561,7 @@ _e_fm2_icon_icon_set(E_Fm2_Icon *ic) { ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj)); e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", - "icons/fileman/file"); + "e/icons/fileman/file"); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon); evas_object_show(ic->obj_icon); } @@ -2216,7 +2216,7 @@ _e_fm2_smart_add(Evas_Object *obj) sd->overlay = edje_object_add(evas_object_evas_get(obj)); evas_object_clip_set(sd->overlay, sd->clip); e_theme_edje_object_set(sd->overlay, "base/theme/fileman", - "fileman/overlay"); + "e/fileman/overlay"); evas_object_smart_member_add(sd->overlay, obj); evas_object_show(sd->overlay); @@ -2374,14 +2374,14 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp) if (!sd) return; mn = e_menu_new(); - e_menu_category_set(mn, "fileman/action"); + e_menu_category_set(mn, "e/fileman/action"); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Refresh View")); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", - "fileman/button/refresh"), - "fileman/button/refresh"); + "e/fileman/button/refresh"), + "e/fileman/button/refresh"); e_menu_item_callback_set(mi, _e_fm2_refresh, sd); if (ecore_file_can_write(sd->realpath)) @@ -2393,8 +2393,8 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp) e_menu_item_label_set(mi, _("New Directory")); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", - "fileman/button/new_dir"), - "fileman/button/new_dir"); + "e/fileman/button/new_dir"), + "e/fileman/button/new_dir"); e_menu_item_callback_set(mi, _e_fm2_new_directory, sd); } @@ -2448,14 +2448,14 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp) sd = ic->sd; mn = e_menu_new(); - e_menu_category_set(mn, "fileman/action"); + e_menu_category_set(mn, "e/fileman/action"); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Refresh View")); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", - "fileman/button/refresh"), - "fileman/button/refresh"); + "e/fileman/button/refresh"), + "e/fileman/button/refresh"); e_menu_item_callback_set(mi, _e_fm2_refresh, ic->sd); if (ecore_file_can_write(sd->realpath)) @@ -2467,8 +2467,8 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp) e_menu_item_label_set(mi, _("New Directory")); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", - "fileman/button/new_dir"), - "fileman/button/new_dir"); + "e/fileman/button/new_dir"), + "e/fileman/button/new_dir"); e_menu_item_callback_set(mi, _e_fm2_new_directory, ic->sd); } @@ -2483,16 +2483,16 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp) e_menu_item_label_set(mi, _("Delete")); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", - "fileman/button/delete"), - "fileman/button/delete"); + "e/fileman/button/delete"), + "e/fileman/button/delete"); e_menu_item_callback_set(mi, _e_fm2_file_delete, ic); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Rename")); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman", - "fileman/button/rename"), - "fileman/button/rename"); + "e/fileman/button/rename"), + "e/fileman/button/rename"); e_menu_item_callback_set(mi, _e_fm2_file_rename, ic); } diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 59194c5d9..9abc3bac6 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -614,7 +614,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc) evas_object_move(gcc->o_control, x, y); evas_object_resize(gcc->o_control, w, h); e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", - "gadman/control"); + "e/gadman/control"); if ((gcc->autoscroll) || (gcc->resizable)) { diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c index c8da828c8..48a6305b1 100644 --- a/src/bin/e_ilist.c +++ b/src/bin/e_ilist.c @@ -105,13 +105,13 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int heade if (header) e_theme_edje_object_set(si->base_obj, "base/theme/widgets", - "widgets/ilist_header"); + "e/widgets/ilist_header"); else if (evas_list_count(sd->items) & 0x1) e_theme_edje_object_set(si->base_obj, "base/theme/widgets", - "widgets/ilist_odd"); + "e/widgets/ilist_odd"); else e_theme_edje_object_set(si->base_obj, "base/theme/widgets", - "widgets/ilist"); + "e/widgets/ilist"); edje_object_part_text_set(si->base_obj, "e.text.label", label); si->icon_obj = icon; if (si->icon_obj) diff --git a/src/bin/e_int_border_border.c b/src/bin/e_int_border_border.c index ba4d49c81..e74a62c72 100644 --- a/src/bin/e_int_border_border.c +++ b/src/bin/e_int_border_border.c @@ -154,13 +154,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf ob = e_livethumb_add(evas); e_livethumb_vsize_set(ob, 160, 96); oj = edje_object_add(e_livethumb_evas_get(ob)); - snprintf(buf, sizeof(buf), "widgets/border/%s/border", (char *)l->data); + snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", (char *)l->data); e_theme_edje_object_set(oj, "base/theme/borders", buf); e_livethumb_thumb_set(ob, oj); orect = evas_object_rectangle_add(e_livethumb_evas_get(ob)); evas_object_color_set(orect, 0, 0, 0, 128); evas_object_show(orect); - edje_object_part_swallow(oj, "client", orect); + edje_object_part_swallow(oj, "e.swallow.client", orect); e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data); if (!strcmp(cfdata->border->client.border.name, (char *)l->data)) sel = n; diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index 176bf0b0d..e4aff5160 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -54,8 +54,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/stack_on_top"), - "widgets/border/default/stack_on_top"); + "e/widgets/border/default/stack_on_top"), + "e/widgets/border/default/stack_on_top"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Normal")); @@ -65,8 +65,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_normal, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/stack_normal"), - "widgets/border/default/stack_normal"); + "e/widgets/border/default/stack_normal"), + "e/widgets/border/default/stack_normal"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Always Below")); @@ -76,8 +76,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/stack_below"), - "widgets/border/default/stack_below"); + "e/widgets/border/default/stack_below"), + "e/widgets/border/default/stack_below"); } /* Only allow to change layer for windows in "normal" layers */ @@ -97,8 +97,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/maximize"), - "widgets/border/default/maximize"); + "e/widgets/border/default/maximize"), + "e/widgets/border/default/maximize"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Maximize vertically")); @@ -108,8 +108,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_vertically, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/maximize"), - "widgets/border/default/maximize"); + "e/widgets/border/default/maximize"), + "e/widgets/border/default/maximize"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Maximize horizontally")); @@ -119,8 +119,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_horizontally, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/maximize"), - "widgets/border/default/maximize"); + "e/widgets/border/default/maximize"), + "e/widgets/border/default/maximize"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Unmaximize")); @@ -130,8 +130,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_unmaximize, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/maximize"), - "widgets/border/default/maximize"); + "e/widgets/border/default/maximize"), + "e/widgets/border/default/maximize"); } m = e_menu_new(); @@ -146,22 +146,22 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_locks, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/locks"), - "widgets/border/default/locks"); + "e/widgets/border/default/locks"), + "e/widgets/border/default/locks"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Remember")); e_menu_item_callback_set(mi, _e_border_menu_cb_remember, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/remember"), - "widgets/border/default/remember"); + "e/widgets/border/default/remember"), + "e/widgets/border/default/remember"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Borders")); e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/borders"), - "widgets/border/default/borders"); + "e/widgets/border/default/borders"), + "e/widgets/border/default/borders"); if (!bd->sticky) { @@ -173,8 +173,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_sendto_pre, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/sendto"), - "widgets/border/default/sendto"); + "e/widgets/border/default/sendto"), + "e/widgets/border/default/sendto"); } mi = e_menu_item_new(m); @@ -185,8 +185,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_submenu_set(mi, bd->border_stacking_menu); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/stacking"), - "widgets/border/default/stacking"); + "e/widgets/border/default/stacking"), + "e/widgets/border/default/stacking"); if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) && (bd->client.icccm.min_h == bd->client.icccm.max_h)) || @@ -197,8 +197,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_submenu_set(mi, bd->border_maximize_menu); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/maximize"), - "widgets/border/default/maximize"); + "e/widgets/border/default/maximize"), + "e/widgets/border/default/maximize"); } if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) && @@ -211,8 +211,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_shade, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/shade"), - "widgets/border/default/shade"); + "e/widgets/border/default/shade"), + "e/widgets/border/default/shade"); } if (!bd->lock_user_sticky) @@ -224,8 +224,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_stick, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/stick"), - "widgets/border/default/stick"); + "e/widgets/border/default/stick"), + "e/widgets/border/default/stick"); } if ((!bd->shaded) && (!bd->fullscreen) && (!bd->lock_border)) @@ -237,8 +237,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_borderless, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/borderless"), - "widgets/border/default/borderless"); + "e/widgets/border/default/borderless"), + "e/widgets/border/default/borderless"); } if ((!bd->lock_user_fullscreen) && (!bd->shaded)) @@ -250,8 +250,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_fullscreen, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/fullscreen"), - "widgets/border/default/fullscreen"); + "e/widgets/border/default/fullscreen"), + "e/widgets/border/default/fullscreen"); } if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) && @@ -264,8 +264,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_skip_winlist, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/skip_winlist"), - "widgets/border/default/skip_winlist"); + "e/widgets/border/default/skip_winlist"), + "e/widgets/border/default/skip_winlist"); } if (!bd->internal) @@ -296,8 +296,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_prop, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/properties"), - "widgets/border/default/properties"); + "e/widgets/border/default/properties"), + "e/widgets/border/default/properties"); mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); @@ -309,8 +309,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_kill, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/kill"), - "widgets/border/default/kill"); + "e/widgets/border/default/kill"), + "e/widgets/border/default/kill"); } if (!bd->lock_close) @@ -320,8 +320,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/close"), - "widgets/border/default/close"); + "e/widgets/border/default/close"), + "e/widgets/border/default/close"); } mi = e_menu_item_new(m); @@ -337,16 +337,16 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_raise, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/stack_on_top"), - "widgets/border/default/stack_on_top"); + "e/widgets/border/default/stack_on_top"), + "e/widgets/border/default/stack_on_top"); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Lower")); e_menu_item_callback_set(mi, _e_border_menu_cb_lower, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/stack_on_top"), - "widgets/border/default/stack_below"); + "e/widgets/border/default/stack_on_top"), + "e/widgets/border/default/stack_below"); mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); @@ -359,8 +359,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_menu_item_callback_set(mi, _e_border_menu_cb_iconify, bd); e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/minimize"), - "widgets/border/default/minimize"); + "e/widgets/border/default/minimize"), + "e/widgets/border/default/minimize"); } if (key) diff --git a/src/bin/e_int_config_desklock.c b/src/bin/e_int_config_desklock.c index 2bc79d578..cb2f0dff9 100644 --- a/src/bin/e_int_config_desklock.c +++ b/src/bin/e_int_config_desklock.c @@ -530,13 +530,13 @@ _load_bgs(E_Config_Dialog_Data *cfdata) ic = NULL; /* Desklock background */ o = edje_object_add(evasbuf); - f1 = e_theme_edje_file_get("base/theme/desklock", "desklock/background"); + f1 = e_theme_edje_file_get("base/theme/desklock", "e/desklock/background"); e_widget_ilist_header_append(cfdata->gui.bg_list, NULL, _("Theme Backgrounds")); - if (edje_object_file_set(o, f1, "desklock/background")) + if (edje_object_file_set(o, f1, "e/desklock/background")) { ic = e_thumb_icon_add(cfd->dia->win->evas); - e_thumb_icon_file_set(ic, f1, "desktop/background"); + e_thumb_icon_file_set(ic, f1, "e/desktop/background"); e_thumb_icon_size_set(ic, 64, (64 * e_zone_current_get(cfd->dia->win->container)->h) / e_zone_current_get(cfd->dia->win->container)->w); @@ -550,7 +550,7 @@ _load_bgs(E_Config_Dialog_Data *cfdata) e_widget_ilist_selected_set(cfdata->gui.bg_list, 1); im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H); - e_widget_preview_edje_set(im, f1, "desklock/background"); + e_widget_preview_edje_set(im, f1, "e/desklock/background"); evas_object_del(o); ecore_evas_free(eebuf); @@ -561,12 +561,12 @@ _load_bgs(E_Config_Dialog_Data *cfdata) evasbuf = ecore_evas_get(eebuf); o = edje_object_add(evasbuf); - f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); + f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); ic = NULL; - if (edje_object_file_set(o, f, "desktop/background")) + if (edje_object_file_set(o, f, "e/desktop/background")) { ic = e_thumb_icon_add(cfd->dia->win->evas); - e_thumb_icon_file_set(ic, f, "desktop/background"); + e_thumb_icon_file_set(ic, f, "e/desktop/background"); e_thumb_icon_size_set(ic, 64, (64 * e_zone_current_get(cfd->dia->win->container)->h) / e_zone_current_get(cfd->dia->win->container)->w); @@ -581,7 +581,7 @@ _load_bgs(E_Config_Dialog_Data *cfdata) e_widget_ilist_selected_set(cfdata->gui.bg_list, 2); evas_object_del(im); im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H); - e_widget_preview_edje_set(im, f, "desktop/background"); + e_widget_preview_edje_set(im, f, "e/desktop/background"); } evas_object_del(o); @@ -608,10 +608,10 @@ _load_bgs(E_Config_Dialog_Data *cfdata) snprintf(full_path, sizeof(full_path), "%s/%s", d->dir, bg_file); if (ecore_file_is_dir(full_path)) continue; - if (!e_util_edje_collection_exists(full_path, "desktop/background")) continue; + if (!e_util_edje_collection_exists(full_path, "e/desktop/background")) continue; ic = e_thumb_icon_add(cfd->dia->win->evas); - e_thumb_icon_file_set(ic, full_path, "desktop/background"); + e_thumb_icon_file_set(ic, full_path, "e/desktop/background"); e_thumb_icon_size_set(ic, 64, (64 * e_zone_current_get(cfd->dia->win->container)->h) / e_zone_current_get(cfd->dia->win->container)->w); @@ -625,7 +625,7 @@ _load_bgs(E_Config_Dialog_Data *cfdata) e_widget_ilist_selected_set(cfdata->gui.bg_list, i); evas_object_del(im); im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H); - e_widget_preview_edje_set(im, full_path, "desktop/background"); + e_widget_preview_edje_set(im, full_path, "e/desktop/background"); } i++; } @@ -652,25 +652,25 @@ _ibg_list_cb_bg_selected(void *data) { const char *theme; - theme = e_theme_edje_file_get("base/theme/desklock", "desklock/background"); - e_widget_preview_edje_set(cfdata->preview_image, theme, "desklock/background"); + theme = e_theme_edje_file_get("base/theme/desklock", "e/desklock/background"); + e_widget_preview_edje_set(cfdata->preview_image, theme, "e/desklock/background"); } else if (!strcmp(cfdata->bg, DEF_THEME_BACKGROUND)) { const char *theme; - theme = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); - e_widget_preview_edje_set(cfdata->preview_image, theme, "desktop/background"); + theme = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); + e_widget_preview_edje_set(cfdata->preview_image, theme, "e/desktop/background"); } else - e_widget_preview_edje_set(cfdata->preview_image, cfdata->bg, "desktop/background"); + e_widget_preview_edje_set(cfdata->preview_image, cfdata->bg, "e/desktop/background"); } else { const char *theme; - theme = e_theme_edje_file_get("base/theme/desklock", "desklock/background"); - e_widget_preview_edje_set(cfdata->preview_image, theme, "desklock/background"); + theme = e_theme_edje_file_get("base/theme/desklock", "e/desklock/background"); + e_widget_preview_edje_set(cfdata->preview_image, theme, "e/desklock/background"); } } diff --git a/src/bin/e_int_config_theme.c b/src/bin/e_int_config_theme.c index 8f3e03e23..58ad54690 100644 --- a/src/bin/e_int_config_theme.c +++ b/src/bin/e_int_config_theme.c @@ -102,7 +102,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info) E_FREE(cfdata->theme); cfdata->theme = strdup(buf); if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, buf, "desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background"); if (cfdata->o_frame) e_widget_change(cfdata->o_frame); } @@ -320,7 +320,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf cfdata->o_preview = o; if (cfdata->theme) f = cfdata->theme; - e_widget_preview_edje_set(o, f, "desktop/background"); + e_widget_preview_edje_set(o, f, "e/desktop/background"); e_widget_list_object_append(of, o, 1, 0, 0.5); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 0, 1, 0, 1); diff --git a/src/bin/e_int_config_wallpaper.c b/src/bin/e_int_config_wallpaper.c index 247d000f1..f379826e0 100644 --- a/src/bin/e_int_config_wallpaper.c +++ b/src/bin/e_int_config_wallpaper.c @@ -75,7 +75,7 @@ e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file) if (cfdata->o_fm) e_fm2_path_set(cfdata->o_fm, path, "/"); if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, "desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, "e/desktop/background"); if (cfdata->o_theme_bg) e_widget_check_checked_set(cfdata->o_theme_bg, 0); cfdata->use_theme_bg = 0; @@ -159,7 +159,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info) E_FREE(cfdata->bg); cfdata->bg = strdup(buf); if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, buf, "desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background"); if (cfdata->o_theme_bg) e_widget_check_checked_set(cfdata->o_theme_bg, 0); cfdata->use_theme_bg = 0; @@ -218,16 +218,16 @@ _cb_theme_wallpaper(void *data, Evas_Object *obj, void *event_info) cfdata = data; if (cfdata->use_theme_bg) { - f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); + f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, f, "desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, f, "e/desktop/background"); } else { if (cfdata->bg) { if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, "desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, "e/desktop/background"); } } } @@ -455,8 +455,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf if (cfdata->bg) f = cfdata->bg; else - f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); - e_widget_preview_edje_set(o, f, "desktop/background"); + f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); + e_widget_preview_edje_set(o, f, "e/desktop/background"); e_widget_list_object_append(of, o, 1, 0, 0.5); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 0, 1, 0, 1); @@ -595,8 +595,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data if (cfdata->bg) f = cfdata->bg; else - f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); - e_widget_preview_edje_set(o, f, "desktop/background"); + f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); + e_widget_preview_edje_set(o, f, "e/desktop/background"); e_widget_list_object_append(of, o, 1, 0, 0.5); ol = e_widget_framelist_add(evas, _("Where to place the Wallpaper"), 0); diff --git a/src/bin/e_int_config_wallpaper_gradient.c b/src/bin/e_int_config_wallpaper_gradient.c index 73fcac8bd..198a5726e 100644 --- a/src/bin/e_int_config_wallpaper_gradient.c +++ b/src/bin/e_int_config_wallpaper_gradient.c @@ -296,7 +296,7 @@ _import_edj_gen(Import *import) "spectra { spectrum { name: \"gradient\"; color: %d %d %d 255 1; color: %d %d %d 255 1; } }\n" "collections {\n" "group {\n" - "name: \"desktop/background\";\n" + "name: \"e/desktop/background\";\n" "parts {\n" "part {\n" " name: \"gradient\";\n" diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index 019ca067f..2f751b7fd 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -473,7 +473,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data ob = e_livethumb_add(evas); e_livethumb_vsize_set(ob, 256, 40); oj = edje_object_add(e_livethumb_evas_get(ob)); - snprintf(buf, sizeof(buf), "shelf/%s/base", (char *)l->data); + snprintf(buf, sizeof(buf), "e/shelf/%s/base", (char *)l->data); e_theme_edje_object_set(oj, "base/theme/shelf", buf); e_livethumb_thumb_set(ob, oj); e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data); diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c index 6a1f738c7..fe799984d 100644 --- a/src/bin/e_manager.c +++ b/src/bin/e_manager.c @@ -685,7 +685,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev char buf[1024]; o = edje_object_add(con->bg_evas); - snprintf(buf, sizeof(buf), "widgets/border/%s/border", border); + snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", border); ok = e_theme_edje_object_set(o, "base/theme/borders", buf); if (ok) { diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 2ced4db18..721804f33 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1137,7 +1137,7 @@ _e_menu_item_realize(E_Menu_Item *mi) o = edje_object_add(mi->menu->evas); mi->separator_object = o; e_theme_edje_object_set(o, "base/theme/menus", - "widgets/menu/default/separator"); + "e/widgets/menu/default/separator"); evas_object_show(o); edje_object_size_min_calc(mi->separator_object, &ww, &hh); mi->separator_w = ww; @@ -1154,14 +1154,14 @@ _e_menu_item_realize(E_Menu_Item *mi) if ((mi->submenu) || (mi->submenu_pre_cb.func)) { if (!e_theme_edje_object_set(mi->bg_object, "base/theme/menus", - "widgets/menu/default/submenu_bg")) + "e/widgets/menu/default/submenu_bg")) goto no_submenu_item; } else { no_submenu_item: e_theme_edje_object_set(mi->bg_object, "base/theme/menus", - "widgets/menu/default/item_bg"); + "e/widgets/menu/default/item_bg"); } evas_object_show(o); @@ -1178,7 +1178,7 @@ _e_menu_item_realize(E_Menu_Item *mi) o = edje_object_add(mi->menu->evas); mi->toggle_object = o; e_theme_edje_object_set(o, "base/theme/menus", - "widgets/menu/default/check"); + "e/widgets/menu/default/check"); evas_object_pass_events_set(o, 1); evas_object_show(o); e_box_pack_end(mi->container_object, o); @@ -1191,7 +1191,7 @@ _e_menu_item_realize(E_Menu_Item *mi) o = edje_object_add(mi->menu->evas); mi->toggle_object = o; e_theme_edje_object_set(o, "base/theme/menus", - "widgets/menu/default/radio"); + "e/widgets/menu/default/radio"); evas_object_pass_events_set(o, 1); evas_object_show(o); e_box_pack_end(mi->container_object, o); @@ -1213,7 +1213,7 @@ _e_menu_item_realize(E_Menu_Item *mi) o = edje_object_add(mi->menu->evas); if (e_theme_edje_object_set(o, "base/theme/menus", - "widgets/menu/default/icon")) + "e/widgets/menu/default/icon")) { mi->icon_bg_object = o; evas_object_show(o); @@ -1307,7 +1307,7 @@ _e_menu_item_realize(E_Menu_Item *mi) o = edje_object_add(mi->menu->evas); mi->label_object = o; e_theme_edje_object_set(o, "base/theme/menus", - "widgets/menu/default/label"); + "e/widgets/menu/default/label"); /* default label */ edje_object_part_text_set(o, "e.text.label", mi->label); evas_object_pass_events_set(o, 1); @@ -1330,7 +1330,7 @@ _e_menu_item_realize(E_Menu_Item *mi) o = edje_object_add(mi->menu->evas); mi->submenu_object = o; e_theme_edje_object_set(o, "base/theme/menus", - "widgets/menu/default/submenu"); + "e/widgets/menu/default/submenu"); evas_object_pass_events_set(o, 1); evas_object_show(o); e_box_pack_end(mi->container_object, o); @@ -1401,7 +1401,7 @@ _e_menu_realize(E_Menu *m) evas_object_move(o, 0, 0); evas_object_resize(o, m->cur.w, m->cur.h); ok = e_theme_edje_object_set(o, "base/theme/menus", - "widgets/menu/default/background"); + "e/widgets/menu/default/background"); if (ok) { const char *shape_option; diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c index 2750deb69..50ad75cfc 100644 --- a/src/bin/e_moveresize.c +++ b/src/bin/e_moveresize.c @@ -28,7 +28,7 @@ e_resize_begin(E_Zone *zone, int w, int h) e_popup_layer_set(_disp_pop, 255); _obj = edje_object_add(_disp_pop->evas); e_theme_edje_object_set(_obj, "base/theme/borders", - "widgets/border/default/resize"); + "e/widgets/border/default/resize"); snprintf(buf, sizeof(buf), "9999x9999"); edje_object_part_text_set(_obj, "e.text.label", buf); @@ -105,7 +105,7 @@ e_move_begin(E_Zone *zone, int x, int y) _disp_pop = e_popup_new(zone, 0, 0, 1, 1); _obj = edje_object_add(_disp_pop->evas); e_theme_edje_object_set(_obj, "base/theme/borders", - "widgets/border/default/move"); + "e/widgets/border/default/move"); snprintf(buf, sizeof(buf), "9999 9999"); edje_object_part_text_set(_obj, "e.text.label", buf); diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index 1af9d3527..2463ad1e2 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -322,13 +322,13 @@ _e_pointer_type_set(E_Pointer *p, const char *type) o = p->pointer_object; if (p->color) { - snprintf(cursor, sizeof(cursor), "pointer/enlightenment/%s/color", type); + snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/color", type); if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor)) goto fallback; } else { - snprintf(cursor, sizeof(cursor), "pointer/enlightenment/%s/mono", type); + snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/mono", type); if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor)) goto fallback; } diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c index 10b696b62..cb412594a 100644 --- a/src/bin/e_scrollframe.c +++ b/src/bin/e_scrollframe.c @@ -671,7 +671,7 @@ _e_smart_add(Evas_Object *obj) o = edje_object_add(evas_object_evas_get(obj)); sd->edje_obj = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/scrollframe"); + "e/widgets/scrollframe"); edje_object_signal_callback_add(o, "drag*", "e.dragable.vbar", _e_smart_edje_drag_v, sd); edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", _e_smart_edje_drag_h, sd); evas_object_smart_member_add(o, obj); diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 2a0d8f81f..74a7c3f03 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -125,11 +125,11 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i es->o_base = edje_object_add(es->evas); es->name = evas_stringshare_add(name); - snprintf(buf, sizeof(buf), "shelf/%s/base", es->style); + snprintf(buf, sizeof(buf), "e/shelf/%s/base", es->style); evas_object_resize(es->o_base, es->w, es->h); if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf)) e_theme_edje_object_set(es->o_base, "base/theme/shelf", - "shelf/default/base"); + "e/shelf/default/base"); if (es->popup) { evas_object_show(es->o_event); @@ -468,13 +468,13 @@ e_shelf_style_set(E_Shelf *es, const char *style) es->style = evas_stringshare_add(style); if (style) - snprintf(buf, sizeof(buf), "shelf/%s/base", style); + snprintf(buf, sizeof(buf), "e/shelf/%s/base", style); else - snprintf(buf, sizeof(buf), "shelf/%s/base", "default"); + snprintf(buf, sizeof(buf), "e/shelf/%s/base", "default"); if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf)) e_theme_edje_object_set(es->o_base, "base/theme/shelf", - "shelf/default/base"); + "e/shelf/default/base"); } EAPI void @@ -769,7 +769,7 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl es = data; o = edje_object_add(gcc->gadcon->evas); - snprintf(buf, sizeof(buf), "shelf/%s/%s", es->style, style); + snprintf(buf, sizeof(buf), "e/shelf/%s/%s", es->style, style); if (!e_theme_edje_object_set(o, "base/theme/shelf", buf)) { evas_object_del(o); diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c index 64f8944d1..71e36f170 100644 --- a/src/bin/e_slider.c +++ b/src/bin/e_slider.c @@ -63,10 +63,10 @@ e_slider_orientation_set(Evas_Object *obj, int horizontal) sd->horizontal = horizontal; if (sd->horizontal) e_theme_edje_object_set(sd->edje_obj, "base/theme/widgets", - "widgets/slider_horizontal"); + "e/widgets/slider_horizontal"); else e_theme_edje_object_set(sd->edje_obj, "base/theme/widgets", - "widgets/slider_vertical"); + "e/widgets/slider_vertical"); edje_object_size_min_calc(sd->edje_obj, &(sd->minw), &(sd->minh)); _e_smart_value_update(sd); } @@ -449,7 +449,7 @@ _e_smart_add(Evas_Object *obj) sd->edje_obj = edje_object_add(evas_object_evas_get(obj)); e_theme_edje_object_set(sd->edje_obj, "base/theme/widgets", - "widgets/slider_vertical"); + "e/widgets/slider_vertical"); edje_object_size_min_calc(sd->edje_obj, &(sd->minw), &(sd->minh)); evas_object_smart_member_add(sd->edje_obj, obj); diff --git a/src/bin/e_test.c b/src/bin/e_test.c index da4b1d63b..831a8ba68 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -194,7 +194,7 @@ _e_test_internal(E_Container *con) o2 = e_scrollframe_add(dia->win->evas); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_test_click, o2); -// e_scrollframe_custom_theme_set(o2, "base/theme/widgets", "widgets/scrollframe"); +// e_scrollframe_custom_theme_set(o2, "base/theme/widgets", "e/widgets/scrollframe"); evas_object_show(o2); #if 0 o3 = e_pan_add(dia->win->evas); @@ -297,7 +297,7 @@ _e_test_internal(E_Container *con) e_livethumb_vsize_set(o3, 160, 96); o4 = edje_object_add(e_livethumb_evas_get(o3)); e_theme_edje_object_set(o4, "base/theme/borders", - "widgets/border/default/border"); + "e/widgets/border/default/border"); e_livethumb_thumb_set(o3, o4); e_ilist_append(o, o3, "Item 1", 0, _e_test_sel, NULL, NULL, NULL); diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c index ece0ba39d..9f6c0776e 100644 --- a/src/bin/e_theme.c +++ b/src/bin/e_theme.c @@ -51,7 +51,7 @@ e_theme_init(void) /* Find transitions */ transitions = _e_theme_collection_items_find("base/theme/transitions", "transitions"); - borders = _e_theme_collection_items_find("base/theme/borders", "widgets/border"); + borders = _e_theme_collection_items_find("base/theme/borders", "e/widgets/border"); shelfs = _e_theme_collection_items_find("base/theme/shelf", "shelf"); return 1; diff --git a/src/bin/e_theme_about.c b/src/bin/e_theme_about.c index 9688e0d7d..0ab69d581 100644 --- a/src/bin/e_theme_about.c +++ b/src/bin/e_theme_about.c @@ -44,7 +44,7 @@ e_theme_about_new(E_Container *con) o = edje_object_add(e_win_evas_get(about->win)); about->bg_object = o; e_theme_edje_object_set(o, "base/theme", - "theme/about"); + "e/theme/about"); evas_object_move(o, 0, 0); evas_object_show(o); diff --git a/src/bin/e_tlist.c b/src/bin/e_tlist.c index dfa70dc59..8a25807ee 100644 --- a/src/bin/e_tlist.c +++ b/src/bin/e_tlist.c @@ -329,10 +329,10 @@ _e_tlist_append(Evas_Object * obj, char *label, /* FIXME: Use a color class or something to avoid duplicating the theme with only the background piccie being different. */ if (evas_list_count(sd->items) & 0x1) e_theme_edje_object_set(si->base_obj, "base/theme/widgets", - "widgets/tlist_odd"); + "e/widgets/tlist_odd"); else e_theme_edje_object_set(si->base_obj, "base/theme/widgets", - "widgets/tlist"); + "e/widgets/tlist"); if (si->markup) edje_object_part_text_set(si->base_obj, "e.textblock.label", label); else diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index cb12388d0..dc7c0391b 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -355,7 +355,7 @@ e_util_edje_icon_set(Evas_Object *obj, const char *name) char buf[4096]; if ((!name) || (!name[0])) return 0; - snprintf(buf, sizeof(buf), "icons/%s", name); + snprintf(buf, sizeof(buf), "e/icons/%s", name); file = e_theme_edje_file_get("base/theme/icons", buf); if (file[0]) { @@ -372,7 +372,7 @@ e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name) char buf[4096]; if ((!name) || (!name[0])) return 0; - snprintf(buf, sizeof(buf), "icons/%s", name); + snprintf(buf, sizeof(buf), "e/icons/%s", name); file = (char *)e_theme_edje_file_get("base/theme/icons", buf); if (file[0]) { diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c index 629b3a867..3ccfc5463 100644 --- a/src/bin/e_widget_button.c +++ b/src/bin/e_widget_button.c @@ -44,7 +44,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func o = edje_object_add(evas); wd->o_button = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/button"); + "e/widgets/button"); edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c index 59381e61b..765591bca 100644 --- a/src/bin/e_widget_check.c +++ b/src/bin/e_widget_check.c @@ -42,7 +42,7 @@ e_widget_check_add(Evas *evas, char *label, int *val) o = edje_object_add(evas); wd->o_check = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/check"); + "e/widgets/check"); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); @@ -109,7 +109,7 @@ e_widget_check_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico o = edje_object_add(evas); wd->o_check = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/check_icon"); + "e/widgets/check_icon"); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); diff --git a/src/bin/e_widget_color_well.c b/src/bin/e_widget_color_well.c index c5e8d4023..2cf8c0406 100644 --- a/src/bin/e_widget_color_well.c +++ b/src/bin/e_widget_color_well.c @@ -108,7 +108,7 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog) e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/color_well"); + "e/widgets/color_well"); edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj); evas_object_show(o); wd->o_edje = o; diff --git a/src/bin/e_widget_cslider.c b/src/bin/e_widget_cslider.c index 45443c27b..1653ca783 100644 --- a/src/bin/e_widget_cslider.c +++ b/src/bin/e_widget_cslider.c @@ -60,7 +60,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver o = edje_object_add(evas); wd->o_cslider = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/cslider"); + "e/widgets/cslider"); if (wd->vertical) edje_object_signal_emit(o, "e,state,direction,v", "e"); else diff --git a/src/bin/e_widget_framelist.c b/src/bin/e_widget_framelist.c index f6c1770c7..28f313567 100644 --- a/src/bin/e_widget_framelist.c +++ b/src/bin/e_widget_framelist.c @@ -32,7 +32,7 @@ e_widget_framelist_add(Evas *evas, char *label, int horiz) o = edje_object_add(evas); wd->o_frame = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/frame"); + "e/widgets/frame"); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); e_widget_sub_object_add(obj, o); diff --git a/src/bin/e_widget_frametable.c b/src/bin/e_widget_frametable.c index 1e9d00f69..3b269d290 100644 --- a/src/bin/e_widget_frametable.c +++ b/src/bin/e_widget_frametable.c @@ -32,7 +32,7 @@ e_widget_frametable_add(Evas *evas, char *label, int homogenous) o = edje_object_add(evas); wd->o_frame = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/frame"); + "e/widgets/frame"); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); e_widget_sub_object_add(obj, o); diff --git a/src/bin/e_widget_iconsel.c b/src/bin/e_widget_iconsel.c index c115efa16..374ad66f6 100644 --- a/src/bin/e_widget_iconsel.c +++ b/src/bin/e_widget_iconsel.c @@ -70,7 +70,7 @@ e_widget_iconsel_add(Evas *evas, Evas_Object *icon, Evas_Coord minw, Evas_Coord o = edje_object_add(evas); wd->o_button = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/button"); + "e/widgets/button"); edje_object_signal_callback_add(o, "click", "", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "label", ""); evas_object_show(o); @@ -122,7 +122,7 @@ e_widget_iconsel_add_from_file(Evas *evas, char *icon, Evas_Coord minw, Evas_Coo o = edje_object_add(evas); wd->o_button = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/button"); + "e/widgets/button"); edje_object_signal_callback_add(o, "click", "", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "label", ""); evas_object_show(o); diff --git a/src/bin/e_widget_label.c b/src/bin/e_widget_label.c index 6f3697436..f655a8754 100644 --- a/src/bin/e_widget_label.c +++ b/src/bin/e_widget_label.c @@ -27,7 +27,7 @@ e_widget_label_add(Evas *evas, const char *label) o = edje_object_add(evas); e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/label"); + "e/widgets/label"); wd->text = o; edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); diff --git a/src/bin/e_widget_preview.c b/src/bin/e_widget_preview.c index ec5e3f3f7..b2b7df36a 100644 --- a/src/bin/e_widget_preview.c +++ b/src/bin/e_widget_preview.c @@ -28,7 +28,7 @@ e_widget_preview_add(Evas *evas, int minw, int minh) o = edje_object_add(evas); wd->o_frame = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/preview"); + "e/widgets/preview"); evas_object_show(o); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c index 44929efc1..4742b2464 100644 --- a/src/bin/e_widget_radio.c +++ b/src/bin/e_widget_radio.c @@ -59,7 +59,7 @@ e_widget_radio_add(Evas *evas, char *label, int valnum, E_Radio_Group *group) o = edje_object_add(evas); wd->o_radio = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/radio"); + "e/widgets/radio"); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); @@ -102,7 +102,7 @@ e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico o = edje_object_add(evas); wd->o_radio = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/radio_icon"); + "e/widgets/radio_icon"); edje_object_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "e.text.label", label); evas_object_show(o); diff --git a/src/bin/e_widget_spectrum.c b/src/bin/e_widget_spectrum.c index ae427361a..20e840a35 100644 --- a/src/bin/e_widget_spectrum.c +++ b/src/bin/e_widget_spectrum.c @@ -54,7 +54,7 @@ e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv) o = edje_object_add(evas); wd->o_edje = o; e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/spectrum"); + "e/widgets/spectrum"); evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); @@ -72,7 +72,7 @@ e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv) e_widget_sub_object_add(obj, o); evas_object_show(o); wd->o_spectrum = o; - edje_object_part_swallow(wd->o_edje, "content", o); + edje_object_part_swallow(wd->o_edje, "e.swallow.content", o); edje_extern_object_min_size_set(o, 100, 100); o = evas_object_rectangle_add(evas); diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c index 97e90b936..9d2d403d4 100644 --- a/src/bin/e_widget_textblock.c +++ b/src/bin/e_widget_textblock.c @@ -37,7 +37,7 @@ e_widget_textblock_add(Evas *evas) o = edje_object_add(evas); e_theme_edje_object_set(o, "base/theme/widgets", - "widgets/textblock"); + "e/widgets/textblock"); wd->o_textblock = o; evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE, _e_wid_cb_scrollframe_resize, wd); e_scrollframe_child_set(wd->o_scrollframe, o); diff --git a/src/bin/e_winlist.c b/src/bin/e_winlist.c index c1650c34e..33a78bea0 100644 --- a/src/bin/e_winlist.c +++ b/src/bin/e_winlist.c @@ -115,7 +115,7 @@ e_winlist_show(E_Zone *zone) o = edje_object_add(winlist->evas); bg_object = o; e_theme_edje_object_set(o, "base/theme/winlist", - "widgets/winlist/main"); + "e/widgets/winlist/main"); evas_object_move(o, 0, 0); evas_object_resize(o, w, h); evas_object_show(o); @@ -428,7 +428,7 @@ _e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk) o = edje_object_add(winlist->evas); ww->bg_object = o; e_theme_edje_object_set(o, "base/theme/winlist", - "widgets/winlist/item"); + "e/widgets/winlist/item"); edje_object_part_text_set(o, "e.text.label", e_border_name_get(ww->border)); evas_object_show(o); if (edje_object_part_exists(ww->bg_object, "e.swallow.icon"))