enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

another chunk 

all group names prefaced by e/
its entirely possible i missed a few small places in this, so there may be some growing pains in the next day or two

also, spectrum content -> e.swallow.content


SVN revision: 25057
This commit is contained in:
rephorm 2006-08-23 03:39:02 +00:00 committed by rephorm
parent a1af7b7d2b
commit 462bda0f22
93 changed files with 425 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/themes/default_about.edc
View File

@ -29,7 +29,7 @@ styles
} }
group { group {
name: "widgets/about/main"; name: "e/widgets/about/main";
parts { parts {
part { part {
name: "base"; name: "base";

2
data/themes/default_background.edc
View File

@ -3,7 +3,7 @@ images {
image: "e17_"SM"reflection_shadow_overlay.png" LOSSY 90; image: "e17_"SM"reflection_shadow_overlay.png" LOSSY 90;
} }
group { group {
name: "desktop/background"; name: "e/desktop/background";
parts { parts {
part { part {
name: "background_image"; name: "background_image";

2
data/themes/default_battery.edc
View File

@ -13,7 +13,7 @@ images {
image: "e17_battery_ac.png" COMP; image: "e17_battery_ac.png" COMP;
} }
group { group {
name: "modules/battery/main"; name: "e/modules/battery/main";
max: 128 128; max: 128 128;
script { script {
public message(Msg_Type:type, id, ...) { public message(Msg_Type:type, id, ...) {

12
data/themes/default_border.edc
View File

@ -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) \ #define FULL_SIZE_BORDER_BUTTON(TYPE) \
group { \ group { \
name: "widgets/border/default/"TYPE; \ name: "e/widgets/border/default/"TYPE; \
parts { \ parts { \
part { \ part { \
name: "whole"; \ name: "whole"; \
@ -261,7 +261,7 @@ images {
} }
group { group {
name: "widgets/border/default/border"; name: "e/widgets/border/default/border";
// ALSO: // ALSO:
// borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped
data { data {
@ -1541,7 +1541,7 @@ group {
} }
group { group {
name: "widgets/border/shaped/border"; name: "e/widgets/border/shaped/border";
// ALSO: // ALSO:
// borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped
data { data {
@ -2584,7 +2584,7 @@ group {
} }
group { group {
name: "widgets/border/dialog/border"; name: "e/widgets/border/dialog/border";
// ALSO: // ALSO:
// borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped
data { data {
@ -3733,7 +3733,7 @@ group {
} }
group { group {
name: "widgets/border/noresize_dialog/border"; name: "e/widgets/border/noresize_dialog/border";
// ALSO: // ALSO:
// borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped
data { data {
@ -4800,7 +4800,7 @@ group {
} }
group { group {
name: "widgets/border/pixel/border"; name: "e/widgets/border/pixel/border";
// ALSO: // ALSO:
// borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped // borderless, noresize, shaped, nofocus, urgent, dialog, modal, skipped
data { data {

2
data/themes/default_button.edc
View File

@ -9,7 +9,7 @@ images {
} }
group { group {
name: "widgets/button"; name: "e/widgets/button";
parts { parts {
part { part {
name: "button_image"; name: "button_image";

4
data/themes/default_check.edc
View File

@ -5,7 +5,7 @@ images {
image: "focus.png" COMP; image: "focus.png" COMP;
} }
group { group {
name: "widgets/check"; name: "e/widgets/check";
parts { parts {
part { part {
name: "outline"; name: "outline";
@ -193,7 +193,7 @@ group {
} }
group { group {
name: "widgets/check_icon"; name: "e/widgets/check_icon";
parts { parts {
part { part {
name: "outline"; name: "outline";

2
data/themes/default_clock.edc
View File

@ -183,7 +183,7 @@ images {
image: "e17_clock_minutes_59.png" COMP; image: "e17_clock_minutes_59.png" COMP;
} }
group { group {
name: "modules/clock/main"; name: "e/modules/clock/main";
script { script {
public clock_cb(val) { public clock_cb(val) {
new buf[11]; new buf[11];

2
data/themes/default_color_well.edc
View File

@ -3,7 +3,7 @@ images {
} }
group { group {
name: "widgets/color_well"; name: "e/widgets/color_well";
parts { parts {
part { part {
name: "background"; name: "background";

2
data/themes/default_configure.edc
View File

@ -9,7 +9,7 @@ images {
} }
group { group {
name: "widgets/configure/main"; name: "e/widgets/configure/main";
parts { parts {
part { part {
name: "base"; name: "base";

2
data/themes/default_cpufreq.edc
View File

@ -19,7 +19,7 @@ images {
} }
group { group {
name: "modules/cpufreq/main"; name: "e/modules/cpufreq/main";
min: 4 4; min: 4 4;
max: 128 128; max: 128 128;

2
data/themes/default_cslider.edc
View File

@ -1,5 +1,5 @@
group { group {
name: "widgets/cslider"; name: "e/widgets/cslider";
parts { parts {
part { part {
name: "background"; name: "background";

4
data/themes/default_desklock.edc
View File

@ -7,7 +7,7 @@ images {
} }
group { group {
name, "desklock/background"; name, "e/desklock/background";
parts { parts {
part { part {
name: "background_image"; name: "background_image";
@ -37,7 +37,7 @@ group {
} }
group group
{ {
name, "desklock/login_box"; name, "e/desklock/login_box";
parts parts
{ {
part part

4
data/themes/default_dialog.edc
View File

@ -16,7 +16,7 @@ styles
} }
group { group {
name: "widgets/dialog/main"; name: "e/widgets/dialog/main";
parts { parts {
part { part {
name: "base"; name: "base";
@ -162,7 +162,7 @@ group {
} }
group { group {
name: "widgets/dialog/text"; name: "e/widgets/dialog/text";
parts { parts {
part { part {
name: "e.textblock.message"; name: "e.textblock.message";

8
data/themes/default_entry.edc
View File

@ -3,7 +3,7 @@ images {
} }
group { group {
name: "widgets/entry"; name: "e/widgets/entry";
min: 18 18; min: 18 18;
parts { parts {
part { part {
@ -77,7 +77,7 @@ group {
} }
group { group {
name: "widgets/entry/text"; name: "e/widgets/entry/text";
parts { parts {
part { part {
name: "e.text.text"; name: "e.text.text";
@ -100,7 +100,7 @@ group {
} }
group { group {
name: "widgets/entry/cursor"; name: "e/widgets/entry/cursor";
min: 1 0; min: 1 0;
parts { parts {
part { part {
@ -156,7 +156,7 @@ group {
} }
group { group {
name: "widgets/entry/selection"; name: "e/widgets/entry/selection";
data { data {
item: "on_foreground" "1"; item: "on_foreground" "1";
} }

4
data/themes/default_error.edc
View File

@ -7,7 +7,7 @@ images {
styles styles
{ {
style { 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"; 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"; tag: "br" "\n";
@ -16,7 +16,7 @@ styles
} }
group { group {
name: "error/main"; name: "e/error/main";
min: 400 200; min: 400 200;
max: 400 200; max: 400 200;
parts { parts {

4
data/themes/default_exebuf.edc
View File

@ -12,7 +12,7 @@ images {
} }
group { group {
name: "widgets/exebuf/main"; name: "e/widgets/exebuf/main";
parts { parts {
part { part {
name: "base"; name: "base";
@ -353,7 +353,7 @@ group {
} }
group { group {
name: "widgets/exebuf/item"; name: "e/widgets/exebuf/item";
parts { parts {
part { part {
name: "title_outline"; name: "title_outline";

38
data/themes/default_fileman.edc
View File

@ -13,7 +13,7 @@ images {
} }
group { group {
name: "fileman/list/fixed"; name: "e/fileman/list/fixed";
parts { parts {
part { part {
name: "base"; name: "base";
@ -688,7 +688,7 @@ group {
} }
group { group {
name: "fileman/list_odd/fixed"; name: "e/fileman/list_odd/fixed";
parts { parts {
part { part {
name: "base"; name: "base";
@ -1363,7 +1363,7 @@ group {
} }
group { group {
name: "fileman/list/variable"; name: "e/fileman/list/variable";
parts { parts {
part { part {
name: "base"; name: "base";
@ -2037,7 +2037,7 @@ group {
} }
group { group {
name: "fileman/list_odd/variable"; name: "e/fileman/list_odd/variable";
parts { parts {
part { part {
name: "base"; name: "base";
@ -2712,7 +2712,7 @@ group {
} }
group { group {
name: "fileman/icon/fixed"; name: "e/fileman/icon/fixed";
parts { parts {
part { part {
name: "icon_overlay"; name: "icon_overlay";
@ -2820,7 +2820,7 @@ group {
} }
group { group {
name: "fileman/icon/variable"; name: "e/fileman/icon/variable";
parts { parts {
part { part {
name: "icon_overlay"; name: "icon_overlay";
@ -2928,7 +2928,7 @@ group {
} }
group { group {
name: "fileman/overlay"; name: "e/fileman/overlay";
parts { parts {
part { part {
name: "busy"; name: "busy";
@ -3067,7 +3067,7 @@ group {
#define FULL_SIZE_FILEMAN_BUTTON(TYPE) \ #define FULL_SIZE_FILEMAN_BUTTON(TYPE) \
group { \ group { \
name: "fileman/button/"TYPE; \ name: "e/fileman/button/"TYPE; \
parts { \ parts { \
part { \ part { \
name: "whole"; \ name: "whole"; \
@ -3091,7 +3091,7 @@ group { \
#define FILEMAN_ICON(TYPE) \ #define FILEMAN_ICON(TYPE) \
group { \ group { \
name: "icons/fileman/"TYPE; \ name: "e/icons/fileman/"TYPE; \
parts { \ parts { \
part { \ part { \
name: "icon"; \ name: "icon"; \
@ -3134,7 +3134,7 @@ group { \
#define FILEMAN_ICON_CLICKABLE(TYPE) \ #define FILEMAN_ICON_CLICKABLE(TYPE) \
group { \ group { \
name: "icons/fileman/"TYPE; \ name: "e/icons/fileman/"TYPE; \
parts { \ parts { \
part { \ part { \
name: "icon"; \ name: "icon"; \
@ -3271,7 +3271,7 @@ images
styles styles
{ {
style { 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"; base: "font=Edje-Vera color=#000 style=shadow shadow_color=#cccccc font_size=10 align=center wrap=char";
tag: "br" "\n"; tag: "br" "\n";
tag: "hilight" "+ font=Edje-Vera-Bold"; tag: "hilight" "+ font=Edje-Vera-Bold";
@ -3280,7 +3280,7 @@ styles
} }
group { group {
name: "fileman/smart"; name: "e/fileman/smart";
parts { parts {
part { part {
name: "background"; name: "background";
@ -3305,7 +3305,7 @@ group {
} }
} }
part { part {
name: "icons"; name: "e/icons";
type: SWALLOW; type: SWALLOW;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -3405,7 +3405,7 @@ group {
} }
group { group {
name: "fileman/main"; name: "e/fileman/main";
parts { parts {
part { part {
name: "background_clip"; name: "background_clip";
@ -4170,7 +4170,7 @@ group {
} }
group { group {
name: "fileman/icon_normal"; name: "e/fileman/icon_normal";
parts { parts {
part { part {
name: "icon_overlay"; name: "icon_overlay";
@ -4366,7 +4366,7 @@ group {
group { group {
name: "fileman/icon_thumb"; name: "e/fileman/icon_thumb";
parts { parts {
part { part {
name: "icon_box_shadow"; name: "icon_box_shadow";
@ -4492,7 +4492,7 @@ group {
group { group {
name: "fileman/icon_list"; name: "e/fileman/icon_list";
parts { parts {
part { part {
name: "e.swallow.icon"; name: "e.swallow.icon";
@ -4577,7 +4577,7 @@ group {
} }
group { group {
name: "fileman/background"; name: "e/fileman/background";
parts { parts {
part { part {
name: "base"; name: "base";
@ -4600,7 +4600,7 @@ group {
} }
group { group {
name: "fileman/rubberband"; name: "e/fileman/rubberband";
parts { parts {
part { part {
name: "base"; name: "base";

2
data/themes/default_filesel.edc
View File

@ -5,7 +5,7 @@ images {
image: "e17_ibar_over_h.png" COMP; image: "e17_ibar_over_h.png" COMP;
} }
group { group {
name: "widgets/fileselector/main"; name: "e/widgets/fileselector/main";
parts { parts {
part { part {
name: "background"; name: "background";

2
data/themes/default_frame.edc
View File

@ -4,7 +4,7 @@ images {
image: "e17_frame_outline.png" COMP; image: "e17_frame_outline.png" COMP;
} }
group { group {
name: "widgets/frame"; name: "e/widgets/frame";
parts { parts {
part { part {
name: "e.swallow.content"; name: "e.swallow.content";

2
data/themes/default_gadman.edc
View File

@ -14,7 +14,7 @@ images {
} }
group { group {
name: "gadman/control"; name: "e/gadman/control";
parts { parts {
part { part {
name: "hclip"; name: "hclip";

8
data/themes/default_ibar.edc
View File

@ -7,7 +7,7 @@ images {
} }
group { group {
name: "modules/ibar/icon"; name: "e/modules/ibar/icon";
data { 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: "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"; // item: "item_list" "item item2 item3";
@ -111,7 +111,7 @@ group {
} }
group { group {
name: "modules/ibar/icon_overlay"; name: "e/modules/ibar/icon_overlay";
data { data {
// item: "item_list", "item item2 item3"; // item: "item_list", "item item2 item3";
} }
@ -328,7 +328,7 @@ group {
} }
group { group {
name: "modules/ibar/drop"; name: "e/modules/ibar/drop";
parts { parts {
part { part {
name: "bg"; name: "bg";
@ -346,7 +346,7 @@ group {
} }
group { group {
name: "modules/ibar/drop_overlay"; name: "e/modules/ibar/drop_overlay";
parts { parts {
part { part {
name: "l1"; name: "l1";

8
data/themes/default_ibox.edc
View File

@ -7,7 +7,7 @@ images {
} }
group { group {
name: "modules/ibox/icon"; name: "e/modules/ibox/icon";
data { 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: "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"; // item: "item_list" "item item2 item3";
@ -111,7 +111,7 @@ group {
} }
group { group {
name: "modules/ibox/icon_overlay"; name: "e/modules/ibox/icon_overlay";
data { data {
// item: "item_list", "item item2 item3"; // item: "item_list", "item item2 item3";
} }
@ -328,7 +328,7 @@ group {
} }
group { group {
name: "modules/ibox/drop"; name: "e/modules/ibox/drop";
parts { parts {
part { part {
name: "bg"; name: "bg";
@ -346,7 +346,7 @@ group {
} }
group { group {
name: "modules/ibox/drop_overlay"; name: "e/modules/ibox/drop_overlay";
parts { parts {
part { part {
name: "l1"; name: "l1";

124
data/themes/default_icons.edc
View File

@ -74,7 +74,7 @@ images {
} }
group { group {
name: "icons/enlightenment/e"; name: "e/icons/enlightenment/e";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -135,7 +135,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/exit"; name: "e/icons/enlightenment/exit";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -196,7 +196,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/reset"; name: "e/icons/enlightenment/reset";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -257,11 +257,11 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/themes"; name: "e/icons/enlightenment/themes";
max: 64 64; max: 64 64;
parts { parts {
part { part {
name: "theme_button"; name: "e/theme_button";
mouse_events: 0; mouse_events: 0;
description { description {
state: "default" 0.0; state: "default" 0.0;
@ -276,7 +276,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/windows"; name: "e/icons/enlightenment/windows";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -295,7 +295,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/lost_windows"; name: "e/icons/enlightenment/lost_windows";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -314,7 +314,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/focus"; name: "e/icons/enlightenment/focus";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -333,7 +333,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/modules"; name: "e/icons/enlightenment/modules";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -352,7 +352,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/favorites"; name: "e/icons/enlightenment/favorites";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -371,7 +371,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/desktops"; name: "e/icons/enlightenment/desktops";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -390,7 +390,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/gadgets"; name: "e/icons/enlightenment/gadgets";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -409,7 +409,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/configuration"; name: "e/icons/enlightenment/configuration";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -428,7 +428,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/run"; name: "e/icons/enlightenment/run";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -447,7 +447,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/fileman"; name: "e/icons/enlightenment/fileman";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -508,7 +508,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/unknown"; name: "e/icons/enlightenment/unknown";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -527,7 +527,7 @@ group {
} }
} }
group { group {
name: "icons/widget/new_dialog"; name: "e/icons/widget/new_dialog";
parts { parts {
part { part {
name: "icon"; name: "icon";
@ -545,7 +545,7 @@ group {
} }
} }
group { group {
name: "icons/widget/up_arrow"; name: "e/icons/widget/up_arrow";
parts { parts {
part { part {
name: "icon"; name: "icon";
@ -563,7 +563,7 @@ group {
} }
} }
group { group {
name: "icons/widget/down_arrow"; name: "e/icons/widget/down_arrow";
parts { parts {
part { part {
name: "icon"; name: "icon";
@ -581,7 +581,7 @@ group {
} }
} }
group { group {
name: "icons/widget/up_dir"; name: "e/icons/widget/up_dir";
parts { parts {
part { part {
name: "icon"; name: "icon";
@ -599,7 +599,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/mouse"; name: "e/icons/enlightenment/mouse";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -618,7 +618,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/keys"; name: "e/icons/enlightenment/keys";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -637,7 +637,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/desklock"; name: "e/icons/enlightenment/desklock";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -656,7 +656,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_resolution"; name: "e/icons/enlightenment/screen_resolution";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -675,7 +675,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf"; name: "e/icons/enlightenment/shelf";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -694,7 +694,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/fonts"; name: "e/icons/enlightenment/fonts";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -713,7 +713,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/background"; name: "e/icons/enlightenment/background";
max: 64 64; max: 64 64;
parts { parts {
part { part {
@ -732,7 +732,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_normal"; name: "e/icons/enlightenment/screen_normal";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -751,7 +751,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_normal"; name: "e/icons/enlightenment/screen_normal";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -770,7 +770,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_around"; name: "e/icons/enlightenment/screen_around";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -789,7 +789,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_left"; name: "e/icons/enlightenment/screen_left";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -808,7 +808,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_right"; name: "e/icons/enlightenment/screen_right";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -827,7 +827,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_vflip"; name: "e/icons/enlightenment/screen_vflip";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -846,7 +846,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/screen_hflip"; name: "e/icons/enlightenment/screen_hflip";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -865,7 +865,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_bottom"; name: "e/icons/enlightenment/shelf_position_bottom";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -884,7 +884,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_bottom_left"; name: "e/icons/enlightenment/shelf_position_bottom_left";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -903,7 +903,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_bottom_right"; name: "e/icons/enlightenment/shelf_position_bottom_right";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -922,7 +922,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_top"; name: "e/icons/enlightenment/shelf_position_top";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -941,7 +941,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_top_left"; name: "e/icons/enlightenment/shelf_position_top_left";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -960,7 +960,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_top_right"; name: "e/icons/enlightenment/shelf_position_top_right";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -979,7 +979,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_left"; name: "e/icons/enlightenment/shelf_position_left";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -998,7 +998,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_left_top"; name: "e/icons/enlightenment/shelf_position_left_top";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1017,7 +1017,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_left_bottom"; name: "e/icons/enlightenment/shelf_position_left_bottom";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1036,7 +1036,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_right"; name: "e/icons/enlightenment/shelf_position_right";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1055,7 +1055,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_right_top"; name: "e/icons/enlightenment/shelf_position_right_top";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1074,7 +1074,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_position_right_bottom"; name: "e/icons/enlightenment/shelf_position_right_bottom";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1093,7 +1093,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_bottom_desk"; name: "e/icons/enlightenment/shelf_bottom_desk";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1112,7 +1112,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_custom"; name: "e/icons/enlightenment/shelf_custom";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1131,7 +1131,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_dock"; name: "e/icons/enlightenment/shelf_dock";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1150,7 +1150,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_menu_bar"; name: "e/icons/enlightenment/shelf_menu_bar";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1169,7 +1169,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_panel"; name: "e/icons/enlightenment/shelf_panel";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1188,7 +1188,7 @@ group {
} }
} }
group { group {
name: "icons/enlightenment/shelf_top_desk"; name: "e/icons/enlightenment/shelf_top_desk";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1208,7 +1208,7 @@ group {
} }
group { group {
name: "icons/enlightenment/wallpaper_stretch"; name: "e/icons/enlightenment/wallpaper_stretch";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1245,7 +1245,7 @@ group {
} }
group { group {
name: "icons/enlightenment/wallpaper_tile"; name: "e/icons/enlightenment/wallpaper_tile";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1287,7 +1287,7 @@ group {
} }
group { group {
name: "icons/enlightenment/wallpaper_center"; name: "e/icons/enlightenment/wallpaper_center";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1330,7 +1330,7 @@ group {
} }
group { group {
name: "icons/enlightenment/wallpaper_scale_aspect_in"; name: "e/icons/enlightenment/wallpaper_scale_aspect_in";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1369,7 +1369,7 @@ group {
} }
group { group {
name: "icons/enlightenment/wallpaper_scale_aspect_out"; name: "e/icons/enlightenment/wallpaper_scale_aspect_out";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1408,7 +1408,7 @@ group {
} }
group { group {
name: "icons/enlightenment/gradient_h"; name: "e/icons/enlightenment/gradient_h";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1450,7 +1450,7 @@ group {
} }
group { group {
name: "icons/enlightenment/gradient_v"; name: "e/icons/enlightenment/gradient_v";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1488,7 +1488,7 @@ group {
} }
group { group {
name: "icons/enlightenment/gradient_du"; name: "e/icons/enlightenment/gradient_du";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1530,7 +1530,7 @@ group {
} }
group { group {
name: "icons/enlightenment/gradient_dd"; name: "e/icons/enlightenment/gradient_dd";
max: 24 24; max: 24 24;
parts { parts {
part { part {
@ -1572,7 +1572,7 @@ group {
} }
group { group {
name: "icons/enlightenment/gradient_rad"; name: "e/icons/enlightenment/gradient_rad";
max: 24 24; max: 24 24;
parts { parts {
part { part {

6
data/themes/default_ilist.edc
View File

@ -3,7 +3,7 @@ images {
image: "e17_ilist_bg1.png" COMP; image: "e17_ilist_bg1.png" COMP;
} }
group { group {
name: "widgets/ilist"; name: "e/widgets/ilist";
parts { parts {
part { part {
name: "base"; name: "base";
@ -470,7 +470,7 @@ group {
} }
group { group {
name: "widgets/ilist_odd"; name: "e/widgets/ilist_odd";
parts { parts {
part { part {
name: "base"; name: "base";
@ -937,7 +937,7 @@ group {
} }
group { group {
name: "widgets/ilist_header"; name: "e/widgets/ilist_header";
parts { parts {
part { part {
name: "base"; name: "base";

2
data/themes/default_label.edc
View File

@ -1,5 +1,5 @@
group { group {
name: "widgets/label"; name: "e/widgets/label";
parts { parts {
part { part {
name: "e.text.label"; name: "e.text.label";

18
data/themes/default_menu.edc
View File

@ -9,7 +9,7 @@ images {
image: "e17_menu_separator.png" COMP; image: "e17_menu_separator.png" COMP;
} }
group { group {
name: "widgets/menu/default/background"; name: "e/widgets/menu/default/background";
data { data {
// this tells e the border is shaped // this tells e the border is shaped
// item: "shaped" "1"; // item: "shaped" "1";
@ -163,7 +163,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/separator"; name: "e/widgets/menu/default/separator";
parts { parts {
part { part {
name: "separator"; name: "separator";
@ -191,7 +191,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/item_bg"; name: "e/widgets/menu/default/item_bg";
parts { parts {
part { part {
name: "e.swallow.content"; name: "e.swallow.content";
@ -212,7 +212,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/submenu_bg"; name: "e/widgets/menu/default/submenu_bg";
parts { parts {
part { part {
name: "e.swallow.content"; name: "e.swallow.content";
@ -233,7 +233,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/check"; name: "e/widgets/menu/default/check";
parts { parts {
part { part {
name: "outline"; name: "outline";
@ -316,7 +316,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/radio"; name: "e/widgets/menu/default/radio";
parts { parts {
part { part {
name: "outline"; name: "outline";
@ -399,7 +399,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/icon"; name: "e/widgets/menu/default/icon";
parts { parts {
part { part {
name: "e.swallow.content"; name: "e.swallow.content";
@ -419,7 +419,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/label"; name: "e/widgets/menu/default/label";
parts { parts {
part { part {
name: "title_outline"; name: "title_outline";
@ -913,7 +913,7 @@ group {
} }
} }
group { group {
name: "widgets/menu/default/submenu"; name: "e/widgets/menu/default/submenu";
parts { parts {
part { part {
name: "arrow"; name: "arrow";

2
data/themes/default_move.edc
View File

@ -2,7 +2,7 @@ images {
image: "e17_menu_bg.png" COMP; image: "e17_menu_bg.png" COMP;
} }
group { group {
name: "widgets/border/default/move"; name: "e/widgets/border/default/move";
parts { parts {
part { part {
name: "base"; name: "base";

6
data/themes/default_pager.edc
View File

@ -10,7 +10,7 @@ images {
} }
group { group {
name: "widgets/pager/popup"; name: "e/widgets/pager/popup";
parts { parts {
part { part {
name: "base"; name: "base";
@ -233,7 +233,7 @@ group {
} }
group { group {
name: "modules/pager/desk"; name: "e/modules/pager/desk";
script { script {
public active; public active;
public drag; public drag;
@ -618,7 +618,7 @@ group {
} }
group { group {
name: "modules/pager/window"; name: "e/modules/pager/window";
parts { parts {
part { part {
name: "overlay"; name: "overlay";

8
data/themes/default_pointer.edc
View File

@ -4,10 +4,10 @@ images {
} }
group { group {
name: "pointer/enlightenment/default/color"; name: "e/pointer/enlightenment/default/color";
parts { parts {
part { part {
name: "pointer"; name: "e/pointer";
type: IMAGE; type: IMAGE;
mouse_events: 0; mouse_events: 0;
description { description {
@ -73,10 +73,10 @@ group {
} }
group { group {
name: "pointer/enlightenment/default/mono"; name: "e/pointer/enlightenment/default/mono";
parts { parts {
part { part {
name: "pointer"; name: "e/pointer";
type: IMAGE; type: IMAGE;
mouse_events: 0; mouse_events: 0;
description { description {

2
data/themes/default_preview.edc
View File

@ -4,7 +4,7 @@ images {
} }
group { group {
name: "widgets/preview"; name: "e/widgets/preview";
parts { parts {
part { part {
name: "bg"; name: "bg";

4
data/themes/default_radio.edc
View File

@ -5,7 +5,7 @@ images {
image: "focus.png" COMP; image: "focus.png" COMP;
} }
group { group {
name: "widgets/radio"; name: "e/widgets/radio";
parts { parts {
part { part {
name: "outline"; name: "outline";
@ -193,7 +193,7 @@ group {
} }
group { group {
name: "widgets/radio_icon"; name: "e/widgets/radio_icon";
parts { parts {
part { part {
name: "outline"; name: "outline";

2
data/themes/default_resize.edc
View File

@ -2,7 +2,7 @@ images {
image: "e17_menu_bg.png" COMP; image: "e17_menu_bg.png" COMP;
} }
group { group {
name: "widgets/border/default/resize"; name: "e/widgets/border/default/resize";
parts { parts {
part { part {
name: "base"; name: "base";

2
data/themes/default_scrollframe.edc
View File

@ -22,7 +22,7 @@ images {
} }
group { group {
name: "widgets/scrollframe"; name: "e/widgets/scrollframe";
parts { parts {
part { part {
name: "bg"; name: "bg";

12
data/themes/default_shelf.edc
View File

@ -8,7 +8,7 @@ images {
} }
group { group {
name: "shelf/default/base"; name: "e/shelf/default/base";
data { data {
// this tells e the border is shaped // this tells e the border is shaped
item: "shaped" "1"; item: "shaped" "1";
@ -421,7 +421,7 @@ group {
} }
} }
group { group {
name: "shelf/default/inset"; name: "e/shelf/default/inset";
parts { parts {
part { part {
name: "background"; name: "background";
@ -517,7 +517,7 @@ group {
group { group {
name: "shelf/gold/base"; name: "e/shelf/gold/base";
data { data {
// this tells e the border is shaped // this tells e the border is shaped
item: "shaped" "1"; item: "shaped" "1";
@ -930,7 +930,7 @@ group {
} }
} }
group { group {
name: "shelf/gold/inset"; name: "e/shelf/gold/inset";
parts { parts {
part { part {
name: "background"; name: "background";
@ -1017,7 +1017,7 @@ group {
group { group {
name: "shelf/invisible/base"; name: "e/shelf/invisible/base";
data { data {
// this tells e the border is shaped // this tells e the border is shaped
item: "shaped" "1"; item: "shaped" "1";
@ -1034,7 +1034,7 @@ group {
} }
} }
group { group {
name: "shelf/invisible/inset"; name: "e/shelf/invisible/inset";
parts { parts {
part { part {
name: "background"; name: "background";

4
data/themes/default_slider.edc
View File

@ -10,7 +10,7 @@ images {
} }
group { group {
name: "widgets/slider_vertical"; name: "e/widgets/slider_vertical";
parts { parts {
part { part {
name: "sld_base"; name: "sld_base";
@ -420,7 +420,7 @@ group {
} }
group { group {
name: "widgets/slider_horizontal"; name: "e/widgets/slider_horizontal";
parts { parts {
part { part {
name: "sld_base"; name: "sld_base";

18
data/themes/default_spectrum.edc
View File

@ -3,7 +3,7 @@ images {
} }
group { group {
name: "widgets/spectrum"; name: "e/widgets/spectrum";
parts { parts {
part { part {
name: "background"; name: "background";
@ -46,7 +46,7 @@ group {
} }
} }
part { part {
name: "content"; name: "e.swallow.content";
type: SWALLOW; type: SWALLOW;
mouse_events: 0; mouse_events: 0;
clip_to: "content_clip"; clip_to: "content_clip";
@ -66,7 +66,7 @@ group {
name: "e.dragable.cursor"; name: "e.dragable.cursor";
type: RECT; type: RECT;
dragable { dragable {
confine: "content"; confine: "e.swallow.content";
x: 1 1 0; x: 1 1 0;
y: 1 1 0; y: 1 1 0;
} }
@ -77,12 +77,12 @@ group {
fixed: 1 1; fixed: 1 1;
visible: 0; visible: 0;
rel1 { rel1 {
to: "content"; to: "e.swallow.content";
relative: 0.5 0.5; relative: 0.5 0.5;
offset: 0 0; offset: 0 0;
} }
rel2 { rel2 {
to: "content"; to: "e.swallow.content";
relative: 0.5 0.5; relative: 0.5 0.5;
offset: 0 0; offset: 0 0;
} }
@ -95,11 +95,11 @@ group {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to_x: "e.dragable.cursor"; to_x: "e.dragable.cursor";
to_y: "content"; to_y: "e.swallow.content";
} }
rel2 { rel2 {
to_x: "e.dragable.cursor"; to_x: "e.dragable.cursor";
to_y: "content"; to_y: "e.swallow.content";
} }
} }
@ -110,11 +110,11 @@ group {
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
to_x: "content"; to_x: "e.swallow.content";
to_y: "e.dragable.cursor"; to_y: "e.dragable.cursor";
} }
rel2 { rel2 {
to_x: "content"; to_x: "e.swallow.content";
to_y: "e.dragable.cursor"; to_y: "e.dragable.cursor";
} }

2
data/themes/default_start.edc
View File

@ -1,5 +1,5 @@
group { group {
name: "modules/start/main"; name: "e/modules/start/main";
max: 128 128; max: 128 128;
script { script {
public is_active; public is_active;

2
data/themes/default_temperature.edc
View File

@ -4,7 +4,7 @@ images {
image: "e17_temperature_overlay.png" COMP; image: "e17_temperature_overlay.png" COMP;
} }
group { group {
name: "modules/temperature/main"; name: "e/modules/temperature/main";
max: 128 128; max: 128 128;
script { script {
public message(Msg_Type:type, id, ...) { public message(Msg_Type:type, id, ...) {

2
data/themes/default_textblock.edc
View File

@ -12,7 +12,7 @@ styles
} }
group { group {
name: "widgets/textblock"; name: "e/widgets/textblock";
parts { parts {
part { part {
name: "e.textblock.text"; name: "e.textblock.text";

4
data/themes/default_theme_about.edc
View File

@ -14,7 +14,7 @@ images {
styles styles
{ {
style { 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"; base: "font=Edje-Vera style=glow color=#fff glow2_color=#fe87 glow_color=#fa14 font_size=12 align=center wrap=word";
tag: "br" "\n"; tag: "br" "\n";
@ -24,7 +24,7 @@ styles
} }
group { group {
name: "theme/about"; name: "e/theme/about";
min: 400 160; min: 400 160;
max: 400 160; max: 400 160;
parts { parts {

4
data/themes/default_tlist.edc
View File

@ -17,7 +17,7 @@ styles
} }
group { group {
name: "widgets/tlist"; name: "e/widgets/tlist";
parts { parts {
part { part {
name: "base"; name: "base";
@ -490,7 +490,7 @@ group {
} }
group { group {
name: "widgets/tlist_odd"; name: "e/widgets/tlist_odd";
parts { parts {
part { part {
name: "base"; name: "base";

4
data/themes/default_transitions.edc
View File

@ -3,7 +3,7 @@ images {
} }
group { group {
name: "transitions/crossfade"; name: "e/transitions/crossfade";
parts { parts {
part { part {
name: "e.swallow.bg.old"; name: "e.swallow.bg.old";
@ -55,7 +55,7 @@ group {
} }
group { group {
name: "transitions/vswipe"; name: "e/transitions/vswipe";
parts { parts {
part { part {
name: "e.swallow.bg.old"; name: "e.swallow.bg.old";

4
data/themes/default_winlist.edc
View File

@ -11,7 +11,7 @@ images {
} }
group { group {
name: "widgets/winlist/main"; name: "e/widgets/winlist/main";
parts { parts {
part { part {
name: "base"; name: "base";
@ -312,7 +312,7 @@ group {
group { group {
name: "widgets/winlist/item"; name: "e/widgets/winlist/item";
parts { parts {
part { part {
name: "title_outline"; name: "title_outline";

2
src/bin/e_about.c
View File

@ -44,7 +44,7 @@ e_about_new(E_Container *con)
o = edje_object_add(e_win_evas_get(about->win)); o = edje_object_add(e_win_evas_get(about->win));
about->bg_object = o; about->bg_object = o;
e_theme_edje_object_set(o, "base/theme/about", e_theme_edje_object_set(o, "base/theme/about",
"widgets/about/main"); "e/widgets/about/main");
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_show(o); evas_object_show(o);

10
src/bin/e_bg.c
View File

@ -41,7 +41,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
{ {
for (ll = entries; ll; ll = ll->next) for (ll = entries; ll; ll = ll->next)
{ {
if (!strcmp(ll->data, "desktop/background")) if (!strcmp(ll->data, "e/desktop/background"))
{ {
bgfile = cfbg->file; bgfile = cfbg->file;
ok = 1; ok = 1;
@ -59,7 +59,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
{ {
for (ll = entries; ll; ll = ll->next) 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; bgfile = e_config->desktop_default_background;
ok = 1; ok = 1;
@ -70,7 +70,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
} }
if (!ok) 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) 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); o = edje_object_add(zone->container->bg_evas);
zone->transition_object = o; zone->transition_object = o;
evas_object_data_set(o, "e_zone", zone); 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); e_theme_edje_object_set(o, "base/theme/transitions", buf);
edje_object_signal_callback_add(o, "e,state,done", "*", _e_bg_signal, zone); edje_object_signal_callback_add(o, "e,state,done", "*", _e_bg_signal, zone);
evas_object_move(o, zone->x, zone->y); 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_data_set(o, "e_zone", zone);
evas_object_move(o, zone->x, zone->y); evas_object_move(o, zone->x, zone->y);
evas_object_resize(o, zone->w, zone->h); 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_layer_set(o, -1);
evas_object_clip_set(o, zone->bg_clip_object); evas_object_clip_set(o, zone->bg_clip_object);
evas_object_show(o); evas_object_show(o);

4
src/bin/e_border.c
View File

@ -5393,12 +5393,12 @@ _e_border_eval(E_Border *bd)
evas_object_del(bd->bg_object); evas_object_del(bd->bg_object);
} }
o = edje_object_add(bd->bg_evas); 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); bd->client.border.name);
ok = e_theme_edje_object_set(o, "base/theme/borders", buf); ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
if ((!ok) && (strcmp(bd->client.border.name, "borderless"))) if ((!ok) && (strcmp(bd->client.border.name, "borderless")))
ok = e_theme_edje_object_set(o, "base/theme/borders", ok = e_theme_edje_object_set(o, "base/theme/borders",
"widgets/border/default/border"); "e/widgets/border/default/border");
if (ok) if (ok)
{ {
const char *shape_option; const char *shape_option;

2
src/bin/e_configure.c
View File

@ -52,7 +52,7 @@ e_configure_show(E_Container *con)
eco->edje = edje_object_add(eco->evas); eco->edje = edje_object_add(eco->evas);
e_theme_edje_object_set(eco->edje, "base/theme/configure", e_theme_edje_object_set(eco->edje, "base/theme/configure",
"widgets/configure/main"); "e/widgets/configure/main");
/* 24 */ /* 24 */
eco->ilist = e_widget_ilist_add(eco->evas, 32, 32, NULL); eco->ilist = e_widget_ilist_add(eco->evas, 32, 32, NULL);

2
src/bin/e_container.c
View File

@ -109,7 +109,7 @@ e_container_new(E_Manager *man)
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_resize(o, con->w, con->h); evas_object_resize(o, con->w, con->h);
evas_object_color_set(o, 255, 255, 255, 255); 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_data_set(o, "e_container", con);
evas_object_show(o); evas_object_show(o);

16
src/bin/e_desklock.c
View File

@ -218,32 +218,32 @@ e_desklock_show(void)
{ {
e_theme_edje_object_set(edp->bg_object, e_theme_edje_object_set(edp->bg_object,
"base/theme/desklock", "base/theme/desklock",
"desklock/background"); "e/desklock/background");
} }
else if (!strcmp(e_config->desklock_background, "theme_background")) else if (!strcmp(e_config->desklock_background, "theme_background"))
{ {
e_theme_edje_object_set(edp->bg_object, e_theme_edje_object_set(edp->bg_object,
"base/theme/backgrounds", "base/theme/backgrounds",
"desktop/background"); "e/desktop/background");
} }
else else
{ {
if (e_util_edje_collection_exists(e_config->desklock_background, 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, edje_object_file_set(edp->bg_object, e_config->desklock_background,
"desklock/background"); "e/desklock/background");
} }
else else
{ {
if (!edje_object_file_set(edp->bg_object, if (!edje_object_file_set(edp->bg_object,
e_config->desklock_background, e_config->desklock_background,
"desktop/background")) "e/desktop/background"))
{ {
edje_object_file_set(edp->bg_object, edje_object_file_set(edp->bg_object,
e_theme_edje_file_get("base/theme/desklock", e_theme_edje_file_get("base/theme/desklock",
"desklock/background"), "e/desklock/background"),
"desklock/background"); "e/desklock/background");
} }
} }
} }
@ -254,7 +254,7 @@ e_desklock_show(void)
edp->login_box = edje_object_add(edp->popup_wnd->evas); edp->login_box = edje_object_add(edp->popup_wnd->evas);
e_theme_edje_object_set(edp->login_box, e_theme_edje_object_set(edp->login_box,
"base/theme/desklock", "base/theme/desklock",
"desklock/login_box"); "e/desklock/login_box");
edje_object_part_text_set(edp->login_box, "e.text.title", edje_object_part_text_set(edp->login_box, "e.text.title",
_("Please enter your unlock password")); _("Please enter your unlock password"));
edje_object_part_swallow(edp->bg_object, "e.swallow.login_box", edp->login_box); edje_object_part_swallow(edp->bg_object, "e.swallow.login_box", edp->login_box);

4
src/bin/e_dialog.c
View File

@ -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)); o = edje_object_add(e_win_evas_get(dia->win));
dia->bg_object = o; dia->bg_object = o;
e_theme_edje_object_set(o, "base/theme/dialog", e_theme_edje_object_set(o, "base/theme/dialog",
"widgets/dialog/main"); "e/widgets/dialog/main");
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_show(o); 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)); o = edje_object_add(e_win_evas_get(dia->win));
dia->text_object = o; dia->text_object = o;
e_theme_edje_object_set(o, "base/theme/dialog", 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); edje_object_part_swallow(dia->bg_object, "e.swallow.content", o);
evas_object_show(o); evas_object_show(o);
} }

4
src/bin/e_entry.c
View File

@ -555,12 +555,12 @@ static void _e_entry_smart_add(Evas_Object *object)
o = edje_object_add(evas); o = edje_object_add(evas);
sd->entry_object = o; 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); evas_object_smart_member_add(o, object);
o = e_editable_add(evas); o = e_editable_add(evas);
sd->editable_object = o; 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_cursor_hide(o);
e_editable_char_size_get(o, &cw, &ch); e_editable_char_size_get(o, &cw, &ch);
edje_extern_object_min_size_set(o, cw, ch); edje_extern_object_min_size_set(o, cw, ch);

2
src/bin/e_error.c
View File

@ -83,7 +83,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
e = ecore_evas_get(ee); e = ecore_evas_get(ee);
o = edje_object_add(e); 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; Evas_Coord tw, th;
char *newstr; char *newstr;

6
src/bin/e_exebuf.c
View File

@ -167,7 +167,7 @@ e_exebuf_show(E_Zone *zone)
o = edje_object_add(exebuf->evas); o = edje_object_add(exebuf->evas);
bg_object = o; bg_object = o;
e_theme_edje_object_set(o, "base/theme/exebuf", 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); edje_object_part_text_set(o, "e.text.label", cmd_buf);
o = e_box_add(exebuf->evas); o = e_box_add(exebuf->evas);
@ -879,7 +879,7 @@ _e_exebuf_matches_update(void)
o = edje_object_add(exebuf->evas); o = edje_object_add(exebuf->evas);
exe->bg_object = o; exe->bg_object = o;
e_theme_edje_object_set(o, "base/theme/exebuf", 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_name_show && exe->app->name) opt |= 0x4;
if (e_config->menu_eap_generic_show && exe->app->generic) opt |= 0x2; if (e_config->menu_eap_generic_show && exe->app->generic) opt |= 0x2;
if (e_config->menu_eap_comment_show && exe->app->comment) opt |= 0x1; 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); o = edje_object_add(exebuf->evas);
exe->bg_object = o; exe->bg_object = o;
e_theme_edje_object_set(o, "base/theme/exebuf", 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); edje_object_part_text_set(o, "e.text.title", exe->file);
evas_object_show(o); evas_object_show(o);
if (edje_object_part_exists(exe->bg_object, "e.swallow.icons")) if (edje_object_part_exists(exe->bg_object, "e.swallow.icons"))

6
src/bin/e_file_dialog.c
View File

@ -57,9 +57,9 @@ e_file_dialog_new(E_Container *con)
list = e_widget_framelist_add(evas, _("Places"), 0); list = e_widget_framelist_add(evas, _("Places"), 0);
e_widget_framelist_content_align_set(list, 0.5, 0.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, _("Home"), "e/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, _("Desktop"), "e/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, _("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, list, 1, 0, 0.0);
e_widget_list_object_append(ol, fm, 1, 1, 0.0); e_widget_list_object_append(ol, fm, 1, 1, 0.0);

2
src/bin/e_fileman.c
View File

@ -137,7 +137,7 @@ e_fileman_new_to_dir(E_Container *con, char *path)
fileman->main = e_scrollframe_add(fileman->evas); fileman->main = e_scrollframe_add(fileman->evas);
e_scrollframe_custom_theme_set(fileman->main, "base/themes/fileman", 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_scrollframe_extern_pan_set(fileman->main, fileman->smart,
_e_fileman_scroll_set, _e_fileman_scroll_set,
_e_fileman_scroll_get, _e_fileman_scroll_get,

4
src/bin/e_fileman_file.c
View File

@ -209,7 +209,7 @@ e_fm_file_is_etheme(E_Fm_File *file)
for (l = groups; l; l = l->next) 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; val = 1;
break; break;
@ -235,7 +235,7 @@ e_fm_file_is_ebg(E_Fm_File *file)
for (l = groups; l; l = l->next) for (l = groups; l; l = l->next)
{ {
if (!strcmp(l->data, "desktop/background")) if (!strcmp(l->data, "e/desktop/background"))
{ {
val = 1; val = 1;
break; break;

12
src/bin/e_fileman_icon.c
View File

@ -150,7 +150,7 @@ e_fm_icon_file_set(Evas_Object *obj, E_Fm_File *file)
evas_object_show(sd->thumb_object); evas_object_show(sd->thumb_object);
sd->image_object = edje_object_add(sd->evas); sd->image_object = edje_object_add(sd->evas);
e_theme_edje_object_set(sd->image_object, "base/theme/fileman", 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_min_size_set(sd->thumb_object, sd->iw, sd->ih);
edje_extern_object_max_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", 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); 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 */ /* 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)) 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); evas_object_show(sd->image_object);
edje_extern_object_min_size_set(sd->image_object, sd->iw, sd->ih); 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: case E_FM_ICON_NORMAL:
e_theme_edje_object_set(sd->icon_object, "base/theme/fileman", e_theme_edje_object_set(sd->icon_object, "base/theme/fileman",
"fileman/icon_normal"); "e/fileman/icon_normal");
break; break;
case E_FM_ICON_LIST: case E_FM_ICON_LIST:
e_theme_edje_object_set(sd->icon_object, "base/theme/fileman", e_theme_edje_object_set(sd->icon_object, "base/theme/fileman",
"fileman/icon_list"); "e/fileman/icon_list");
break; break;
default: default:
e_theme_edje_object_set(sd->icon_object, "base/theme/fileman", e_theme_edje_object_set(sd->icon_object, "base/theme/fileman",
"fileman/icon_normal"); "e/fileman/icon_normal");
break; break;
} }

96
src/bin/e_fileman_smart.c
View File

@ -586,7 +586,7 @@ _e_fm_smart_add(Evas_Object *object)
evas_object_repeat_events_set(sd->edje_obj, 1); evas_object_repeat_events_set(sd->edje_obj, 1);
e_theme_edje_object_set(sd->edje_obj, e_theme_edje_object_set(sd->edje_obj,
"base/theme/fileman", "base/theme/fileman",
"fileman/smart"); "e/fileman/smart");
evas_object_smart_member_add(sd->edje_obj, object); evas_object_smart_member_add(sd->edje_obj, object);
evas_object_show(sd->edje_obj); 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); evas_object_smart_member_add(sd->selection.band.obj, object);
e_theme_edje_object_set(sd->selection.band.obj, e_theme_edje_object_set(sd->selection.band.obj,
"base/theme/fileman/rubberband", "base/theme/fileman/rubberband",
"fileman/rubberband"); "e/fileman/rubberband");
evas_object_focus_set(sd->object, 1); evas_object_focus_set(sd->object, 1);
evas_object_event_callback_add(sd->object, EVAS_CALLBACK_KEY_DOWN, _e_fm_key_down_cb, sd); 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; if (!sd->win) break;
mn = e_menu_new(); mn = e_menu_new();
e_menu_category_set(mn,"fileman/unknown"); e_menu_category_set(mn,"e/fileman/unknown");
e_menu_category_data_set("fileman/unknown",sd); e_menu_category_data_set("e/fileman/unknown",sd);
sd->menu = mn; 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_label_set(mi, _("Arrange Icons"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/arrange"), "e/fileman/button/arrange"),
"fileman/button/arrange"); "e/fileman/button/arrange");
mn = e_menu_new(); mn = e_menu_new();
e_menu_category_set(mn,"fileman/unknown/arrange"); e_menu_category_set(mn,"e/fileman/unknown/arrange");
e_menu_category_data_set("fileman/unknown/arrange",sd); e_menu_category_data_set("e/fileman/unknown/arrange",sd);
e_menu_item_submenu_set(mi, mn); e_menu_item_submenu_set(mi, mn);
mi = e_menu_item_new(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_callback_set(mi, _e_fm_menu_arrange_cb, sd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/arrange_name"), "e/fileman/button/arrange_name"),
"fileman/button/arrange_name"); "e/fileman/button/arrange_name");
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("By Mod Time")); 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_callback_set(mi, _e_fm_menu_arrange_cb, sd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/arrange_time"), "e/fileman/button/arrange_time"),
"fileman/button/arrange_time"); "e/fileman/button/arrange_time");
/*- New -*/ /*- New -*/
mi = e_menu_item_new(sd->menu); mi = e_menu_item_new(sd->menu);
e_menu_item_label_set(mi, _("New")); e_menu_item_label_set(mi, _("New"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/new"), "e/fileman/button/new"),
"fileman/button/new"); "e/fileman/button/new");
mn = e_menu_new(); mn = e_menu_new();
e_menu_category_set(mn,"fileman/unknown/new"); e_menu_category_set(mn,"e/fileman/unknown/new");
e_menu_category_data_set("fileman/unknown/new",sd); e_menu_category_data_set("e/fileman/unknown/new",sd);
e_menu_item_submenu_set(mi, mn); e_menu_item_submenu_set(mi, mn);
mi = e_menu_item_new(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_callback_set(mi, _e_fm_menu_new_dir_cb, sd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/new_dir"), "e/fileman/button/new_dir"),
"fileman/button/new_dir"); "e/fileman/button/new_dir");
/*- View -*/ /*- View -*/
mi = e_menu_item_new(sd->menu); mi = e_menu_item_new(sd->menu);
e_menu_item_label_set(mi, _("View")); e_menu_item_label_set(mi, _("View"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/view"), "e/fileman/button/view"),
"fileman/button/view"); "e/fileman/button/view");
mn = e_menu_new(); mn = e_menu_new();
e_menu_category_set(mn,"fileman/unknown/view"); e_menu_category_set(mn,"e/fileman/unknown/view");
e_menu_category_data_set("fileman/unknown/view",sd); e_menu_category_data_set("e/fileman/unknown/view",sd);
e_menu_item_submenu_set(mi, mn); e_menu_item_submenu_set(mi, mn);
mi = e_menu_item_new(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_radio_group_set(mi, 2);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/view_name"), "e/fileman/button/view_name"),
"fileman/button/view_name"); "e/fileman/button/view_name");
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Details")); 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_radio_group_set(mi, 2);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/view_details"), "e/fileman/button/view_details"),
"fileman/button/view_details"); "e/fileman/button/view_details");
/*- Refresh -*/ /*- Refresh -*/
mi = e_menu_item_new(sd->menu); 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_callback_set(mi, _e_fm_menu_refresh_cb, sd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/refresh"), "e/fileman/button/refresh"),
"fileman/button/refresh"); "e/fileman/button/refresh");
/*- Properties -*/ /*- Properties -*/
mi = e_menu_item_new(sd->menu); mi = e_menu_item_new(sd->menu);
e_menu_item_label_set(mi, _("Properties")); e_menu_item_label_set(mi, _("Properties"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/properties"), "e/fileman/button/properties"),
"fileman/button/properties"); "e/fileman/button/properties");
ecore_evas_geometry_get(sd->win->ecore_evas, &x, &y, &w, &h); 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; multiple = 1;
mn = e_menu_new(); mn = e_menu_new();
e_menu_category_set(mn,"fileman/action"); e_menu_category_set(mn,"e/fileman/action");
e_menu_category_data_set("fileman/action",sd); e_menu_category_data_set("e/fileman/action",sd);
mi = NULL; mi = NULL;
default_action = 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_label_set(mi, _(action->label));
e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); 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", 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); mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1); 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_label_set(mi, _(action->label));
e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); 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", 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; 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_callback_set(mi, _e_fm_file_menu_copy, icon);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/copy"), "e/fileman/button/copy"),
"fileman/button/copy"); "e/fileman/button/copy");
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Cut")); e_menu_item_label_set(mi, _("Cut"));
//e_menu_item_callback_set(mi, _e_fm_file_menu_cut, icon); //e_menu_item_callback_set(mi, _e_fm_file_menu_cut, icon);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/cut"), "e/fileman/button/cut"),
"fileman/button/cut"); "e/fileman/button/cut");
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1); 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_callback_set(mi, _e_fm_file_menu_rename, icon);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/rename"), "e/fileman/button/rename"),
"fileman/button/rename"); "e/fileman/button/rename");
} }
mi = e_menu_item_new(mn); 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_callback_set(mi, _e_fm_file_menu_delete, icon);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/delete"), "e/fileman/button/delete"),
"fileman/button/delete"); "e/fileman/button/delete");
mi = e_menu_item_new(mn); 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_callback_set(mi, _e_fm_file_menu_properties, icon);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/fileman", (char *)e_theme_edje_file_get("base/theme/fileman",
"fileman/button/properties"), "e/fileman/button/properties"),
"fileman/button/properties"); "e/fileman/button/properties");
sd->operation.menu = mn; sd->operation.menu = mn;
if (!sd->win) return; 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; multiple = 1;
mn = e_menu_new(); mn = e_menu_new();
e_menu_category_set(mn,"fileman/action"); e_menu_category_set(mn,"e/fileman/action");
e_menu_category_data_set("fileman/action",sd); e_menu_category_data_set("e/fileman/action",sd);
mi = NULL; mi = NULL;
default_action = 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_label_set(mi, e_fm_mime_translate(sd, action->label));
e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); 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", 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); mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1); 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_label_set(mi, e_fm_mime_translate(sd, action->label));
e_menu_item_callback_set(mi, _e_fm_menu_actions, mid); 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", 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; mime = mime->parent;

58
src/bin/e_fm.c
View File

@ -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)); obj = edje_object_add(evas_object_evas_get(sd->obj));
e_theme_edje_object_set(obj, "base/theme/fileman", e_theme_edje_object_set(obj, "base/theme/fileman",
"fileman/icon/variable"); "e/fileman/icon/variable");
sd->tmp.obj = obj; sd->tmp.obj = obj;
} }
_e_fm2_icon_label_set(ic, 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)); obj = edje_object_add(evas_object_evas_get(sd->obj));
if (sd->config->icon.fixed.w) if (sd->config->icon.fixed.w)
e_theme_edje_object_set(obj, "base/theme/fileman", e_theme_edje_object_set(obj, "base/theme/fileman",
"fileman/list/fixed"); "e/fileman/list/fixed");
else else
e_theme_edje_object_set(obj, "base/theme/fileman", e_theme_edje_object_set(obj, "base/theme/fileman",
"fileman/list/variable"); "e/fileman/list/variable");
sd->tmp.obj = obj; sd->tmp.obj = obj;
} }
_e_fm2_icon_label_set(ic, obj); _e_fm2_icon_label_set(ic, obj);
@ -1345,29 +1345,29 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
{ {
if (ic->odd) if (ic->odd)
e_theme_edje_object_set(ic->obj, "base/theme/widgets", e_theme_edje_object_set(ic->obj, "base/theme/widgets",
"fileman/list_odd/fixed"); "e/fileman/list_odd/fixed");
else else
e_theme_edje_object_set(ic->obj, "base/theme/widgets", e_theme_edje_object_set(ic->obj, "base/theme/widgets",
"fileman/list/fixed"); "e/fileman/list/fixed");
} }
else else
{ {
if (ic->odd) if (ic->odd)
e_theme_edje_object_set(ic->obj, "base/theme/widgets", e_theme_edje_object_set(ic->obj, "base/theme/widgets",
"fileman/list_odd/variable"); "e/fileman/list_odd/variable");
else else
e_theme_edje_object_set(ic->obj, "base/theme/widgets", e_theme_edje_object_set(ic->obj, "base/theme/widgets",
"fileman/list/variable"); "e/fileman/list/variable");
} }
} }
else else
{ {
if (ic->sd->config->icon.fixed.w) if (ic->sd->config->icon.fixed.w)
e_theme_edje_object_set(ic->obj, "base/theme/fileman", e_theme_edje_object_set(ic->obj, "base/theme/fileman",
"fileman/icon/fixed"); "e/fileman/icon/fixed");
else else
e_theme_edje_object_set(ic->obj, "base/theme/fileman", 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); _e_fm2_icon_label_set(ic, ic->obj);
evas_object_clip_set(ic->obj, ic->sd->clip); 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, '/'); p = strchr(ic->info.mime, '/');
if (p) p++; if (p) p++;
else p = (char *)ic->info.mime; 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)); 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", if (!e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman",
buf)) buf))
e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", 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); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(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)); ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj));
e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", 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); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(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); 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)); 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); 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); evas_object_smart_callback_add(ic->obj_icon, "e_thumb_gen", _e_fm2_cb_icon_thumb_gen, ic);
_e_fm2_icon_thumb(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)); ic->obj_icon = edje_object_add(evas_object_evas_get(ic->sd->obj));
e_theme_edje_object_set(ic->obj_icon, "base/theme/fileman", 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); edje_object_part_swallow(ic->obj, "e.swallow.icon", ic->obj_icon);
evas_object_show(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)); sd->overlay = edje_object_add(evas_object_evas_get(obj));
evas_object_clip_set(sd->overlay, sd->clip); evas_object_clip_set(sd->overlay, sd->clip);
e_theme_edje_object_set(sd->overlay, "base/theme/fileman", 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_smart_member_add(sd->overlay, obj);
evas_object_show(sd->overlay); evas_object_show(sd->overlay);
@ -2374,14 +2374,14 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
if (!sd) return; if (!sd) return;
mn = e_menu_new(); 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); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Refresh View")); e_menu_item_label_set(mi, _("Refresh View"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman", e_theme_edje_file_get("base/theme/fileman",
"fileman/button/refresh"), "e/fileman/button/refresh"),
"fileman/button/refresh"); "e/fileman/button/refresh");
e_menu_item_callback_set(mi, _e_fm2_refresh, sd); e_menu_item_callback_set(mi, _e_fm2_refresh, sd);
if (ecore_file_can_write(sd->realpath)) 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_label_set(mi, _("New Directory"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman", e_theme_edje_file_get("base/theme/fileman",
"fileman/button/new_dir"), "e/fileman/button/new_dir"),
"fileman/button/new_dir"); "e/fileman/button/new_dir");
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd); 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; sd = ic->sd;
mn = e_menu_new(); 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); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Refresh View")); e_menu_item_label_set(mi, _("Refresh View"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman", e_theme_edje_file_get("base/theme/fileman",
"fileman/button/refresh"), "e/fileman/button/refresh"),
"fileman/button/refresh"); "e/fileman/button/refresh");
e_menu_item_callback_set(mi, _e_fm2_refresh, ic->sd); e_menu_item_callback_set(mi, _e_fm2_refresh, ic->sd);
if (ecore_file_can_write(sd->realpath)) 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_label_set(mi, _("New Directory"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman", e_theme_edje_file_get("base/theme/fileman",
"fileman/button/new_dir"), "e/fileman/button/new_dir"),
"fileman/button/new_dir"); "e/fileman/button/new_dir");
e_menu_item_callback_set(mi, _e_fm2_new_directory, ic->sd); 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_label_set(mi, _("Delete"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman", e_theme_edje_file_get("base/theme/fileman",
"fileman/button/delete"), "e/fileman/button/delete"),
"fileman/button/delete"); "e/fileman/button/delete");
e_menu_item_callback_set(mi, _e_fm2_file_delete, ic); e_menu_item_callback_set(mi, _e_fm2_file_delete, ic);
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Rename")); e_menu_item_label_set(mi, _("Rename"));
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman", e_theme_edje_file_get("base/theme/fileman",
"fileman/button/rename"), "e/fileman/button/rename"),
"fileman/button/rename"); "e/fileman/button/rename");
e_menu_item_callback_set(mi, _e_fm2_file_rename, ic); e_menu_item_callback_set(mi, _e_fm2_file_rename, ic);
} }

2
src/bin/e_gadcon.c
View File

@ -614,7 +614,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
evas_object_move(gcc->o_control, x, y); evas_object_move(gcc->o_control, x, y);
evas_object_resize(gcc->o_control, w, h); evas_object_resize(gcc->o_control, w, h);
e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", e_theme_edje_object_set(gcc->o_control, "base/theme/gadman",
"gadman/control"); "e/gadman/control");
if ((gcc->autoscroll) || (gcc->resizable)) if ((gcc->autoscroll) || (gcc->resizable))
{ {

6
src/bin/e_ilist.c
View File

@ -105,13 +105,13 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int heade
if (header) if (header)
e_theme_edje_object_set(si->base_obj, "base/theme/widgets", 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) else if (evas_list_count(sd->items) & 0x1)
e_theme_edje_object_set(si->base_obj, "base/theme/widgets", e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"widgets/ilist_odd"); "e/widgets/ilist_odd");
else else
e_theme_edje_object_set(si->base_obj, "base/theme/widgets", 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); edje_object_part_text_set(si->base_obj, "e.text.label", label);
si->icon_obj = icon; si->icon_obj = icon;
if (si->icon_obj) if (si->icon_obj)

4
src/bin/e_int_border_border.c
View File

@ -154,13 +154,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
ob = e_livethumb_add(evas); ob = e_livethumb_add(evas);
e_livethumb_vsize_set(ob, 160, 96); e_livethumb_vsize_set(ob, 160, 96);
oj = edje_object_add(e_livethumb_evas_get(ob)); 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_theme_edje_object_set(oj, "base/theme/borders", buf);
e_livethumb_thumb_set(ob, oj); e_livethumb_thumb_set(ob, oj);
orect = evas_object_rectangle_add(e_livethumb_evas_get(ob)); orect = evas_object_rectangle_add(e_livethumb_evas_get(ob));
evas_object_color_set(orect, 0, 0, 0, 128); evas_object_color_set(orect, 0, 0, 0, 128);
evas_object_show(orect); 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); e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data);
if (!strcmp(cfdata->border->client.border.name, (char *)l->data)) if (!strcmp(cfdata->border->client.border.name, (char *)l->data))
sel = n; sel = n;

96
src/bin/e_int_border_menu.c
View File

@ -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_callback_set(mi, _e_border_menu_cb_on_top, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_on_top"), "e/widgets/border/default/stack_on_top"),
"widgets/border/default/stack_on_top"); "e/widgets/border/default/stack_on_top");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Normal")); 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_callback_set(mi, _e_border_menu_cb_normal, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_normal"), "e/widgets/border/default/stack_normal"),
"widgets/border/default/stack_normal"); "e/widgets/border/default/stack_normal");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always Below")); 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_callback_set(mi, _e_border_menu_cb_below, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_below"), "e/widgets/border/default/stack_below"),
"widgets/border/default/stack_below"); "e/widgets/border/default/stack_below");
} }
/* Only allow to change layer for windows in "normal" layers */ /* 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_callback_set(mi, _e_border_menu_cb_maximize, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/maximize"), "e/widgets/border/default/maximize"),
"widgets/border/default/maximize"); "e/widgets/border/default/maximize");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Maximize vertically")); 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_callback_set(mi, _e_border_menu_cb_maximize_vertically, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/maximize"), "e/widgets/border/default/maximize"),
"widgets/border/default/maximize"); "e/widgets/border/default/maximize");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Maximize horizontally")); 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_callback_set(mi, _e_border_menu_cb_maximize_horizontally, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/maximize"), "e/widgets/border/default/maximize"),
"widgets/border/default/maximize"); "e/widgets/border/default/maximize");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Unmaximize")); 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_callback_set(mi, _e_border_menu_cb_unmaximize, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/maximize"), "e/widgets/border/default/maximize"),
"widgets/border/default/maximize"); "e/widgets/border/default/maximize");
} }
m = e_menu_new(); 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_callback_set(mi, _e_border_menu_cb_locks, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/locks"), "e/widgets/border/default/locks"),
"widgets/border/default/locks"); "e/widgets/border/default/locks");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Remember")); e_menu_item_label_set(mi, _("Remember"));
e_menu_item_callback_set(mi, _e_border_menu_cb_remember, bd); e_menu_item_callback_set(mi, _e_border_menu_cb_remember, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/remember"), "e/widgets/border/default/remember"),
"widgets/border/default/remember"); "e/widgets/border/default/remember");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Borders")); e_menu_item_label_set(mi, _("Borders"));
e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd); e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/borders"), "e/widgets/border/default/borders"),
"widgets/border/default/borders"); "e/widgets/border/default/borders");
if (!bd->sticky) 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_submenu_pre_callback_set(mi, _e_border_menu_cb_sendto_pre, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/sendto"), "e/widgets/border/default/sendto"),
"widgets/border/default/sendto"); "e/widgets/border/default/sendto");
} }
mi = e_menu_item_new(m); 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_submenu_set(mi, bd->border_stacking_menu);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stacking"), "e/widgets/border/default/stacking"),
"widgets/border/default/stacking"); "e/widgets/border/default/stacking");
if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) && if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) &&
(bd->client.icccm.min_h == bd->client.icccm.max_h)) || (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_submenu_set(mi, bd->border_maximize_menu);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/maximize"), "e/widgets/border/default/maximize"),
"widgets/border/default/maximize"); "e/widgets/border/default/maximize");
} }
if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) && 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_callback_set(mi, _e_border_menu_cb_shade, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/shade"), "e/widgets/border/default/shade"),
"widgets/border/default/shade"); "e/widgets/border/default/shade");
} }
if (!bd->lock_user_sticky) 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_callback_set(mi, _e_border_menu_cb_stick, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stick"), "e/widgets/border/default/stick"),
"widgets/border/default/stick"); "e/widgets/border/default/stick");
} }
if ((!bd->shaded) && (!bd->fullscreen) && (!bd->lock_border)) 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_callback_set(mi, _e_border_menu_cb_borderless, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/borderless"), "e/widgets/border/default/borderless"),
"widgets/border/default/borderless"); "e/widgets/border/default/borderless");
} }
if ((!bd->lock_user_fullscreen) && (!bd->shaded)) 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_callback_set(mi, _e_border_menu_cb_fullscreen, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/fullscreen"), "e/widgets/border/default/fullscreen"),
"widgets/border/default/fullscreen"); "e/widgets/border/default/fullscreen");
} }
if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) && 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_callback_set(mi, _e_border_menu_cb_skip_winlist, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/skip_winlist"), "e/widgets/border/default/skip_winlist"),
"widgets/border/default/skip_winlist"); "e/widgets/border/default/skip_winlist");
} }
if (!bd->internal) 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_callback_set(mi, _e_border_menu_cb_prop, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/properties"), "e/widgets/border/default/properties"),
"widgets/border/default/properties"); "e/widgets/border/default/properties");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); 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_callback_set(mi, _e_border_menu_cb_kill, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/kill"), "e/widgets/border/default/kill"),
"widgets/border/default/kill"); "e/widgets/border/default/kill");
} }
if (!bd->lock_close) 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_callback_set(mi, _e_border_menu_cb_close, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/close"), "e/widgets/border/default/close"),
"widgets/border/default/close"); "e/widgets/border/default/close");
} }
mi = e_menu_item_new(m); 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_callback_set(mi, _e_border_menu_cb_raise, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_on_top"), "e/widgets/border/default/stack_on_top"),
"widgets/border/default/stack_on_top"); "e/widgets/border/default/stack_on_top");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Lower")); e_menu_item_label_set(mi, _("Lower"));
e_menu_item_callback_set(mi, _e_border_menu_cb_lower, bd); e_menu_item_callback_set(mi, _e_border_menu_cb_lower, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_on_top"), "e/widgets/border/default/stack_on_top"),
"widgets/border/default/stack_below"); "e/widgets/border/default/stack_below");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); 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_callback_set(mi, _e_border_menu_cb_iconify, bd);
e_menu_item_icon_edje_set(mi, e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/borders", e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/minimize"), "e/widgets/border/default/minimize"),
"widgets/border/default/minimize"); "e/widgets/border/default/minimize");
} }
if (key) if (key)

36
src/bin/e_int_config_desklock.c
View File

@ -530,13 +530,13 @@ _load_bgs(E_Config_Dialog_Data *cfdata)
ic = NULL; ic = NULL;
/* Desklock background */ /* Desklock background */
o = edje_object_add(evasbuf); 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")); 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); 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, e_thumb_icon_size_set(ic, 64,
(64 * e_zone_current_get(cfd->dia->win->container)->h) / (64 * e_zone_current_get(cfd->dia->win->container)->h) /
e_zone_current_get(cfd->dia->win->container)->w); 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); e_widget_ilist_selected_set(cfdata->gui.bg_list, 1);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H); 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); evas_object_del(o);
ecore_evas_free(eebuf); ecore_evas_free(eebuf);
@ -561,12 +561,12 @@ _load_bgs(E_Config_Dialog_Data *cfdata)
evasbuf = ecore_evas_get(eebuf); evasbuf = ecore_evas_get(eebuf);
o = edje_object_add(evasbuf); 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; 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); 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, e_thumb_icon_size_set(ic, 64,
(64 * e_zone_current_get(cfd->dia->win->container)->h) / (64 * e_zone_current_get(cfd->dia->win->container)->h) /
e_zone_current_get(cfd->dia->win->container)->w); 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); e_widget_ilist_selected_set(cfdata->gui.bg_list, 2);
evas_object_del(im); evas_object_del(im);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H); 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); 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); snprintf(full_path, sizeof(full_path), "%s/%s", d->dir, bg_file);
if (ecore_file_is_dir(full_path)) continue; 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); 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, e_thumb_icon_size_set(ic, 64,
(64 * e_zone_current_get(cfd->dia->win->container)->h) / (64 * e_zone_current_get(cfd->dia->win->container)->h) /
e_zone_current_get(cfd->dia->win->container)->w); 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); e_widget_ilist_selected_set(cfdata->gui.bg_list, i);
evas_object_del(im); evas_object_del(im);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H); 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++; i++;
} }
@ -652,25 +652,25 @@ _ibg_list_cb_bg_selected(void *data)
{ {
const char *theme; const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock", "desklock/background"); theme = e_theme_edje_file_get("base/theme/desklock", "e/desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme, "desklock/background"); e_widget_preview_edje_set(cfdata->preview_image, theme, "e/desklock/background");
} }
else if (!strcmp(cfdata->bg, DEF_THEME_BACKGROUND)) else if (!strcmp(cfdata->bg, DEF_THEME_BACKGROUND))
{ {
const char *theme; const char *theme;
theme = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); theme = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
e_widget_preview_edje_set(cfdata->preview_image, theme, "desktop/background"); e_widget_preview_edje_set(cfdata->preview_image, theme, "e/desktop/background");
} }
else 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 else
{ {
const char *theme; const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock", "desklock/background"); theme = e_theme_edje_file_get("base/theme/desklock", "e/desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme, "desklock/background"); e_widget_preview_edje_set(cfdata->preview_image, theme, "e/desklock/background");
} }
} }

4
src/bin/e_int_config_theme.c
View File

@ -102,7 +102,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
E_FREE(cfdata->theme); E_FREE(cfdata->theme);
cfdata->theme = strdup(buf); cfdata->theme = strdup(buf);
if (cfdata->o_preview) 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) if (cfdata->o_frame)
e_widget_change(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; cfdata->o_preview = o;
if (cfdata->theme) if (cfdata->theme)
f = 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_list_object_append(of, o, 1, 0, 0.5);
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 0, 1, 0, 1); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 0, 1, 0, 1);

18
src/bin/e_int_config_wallpaper.c
View File

@ -75,7 +75,7 @@ e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
if (cfdata->o_fm) if (cfdata->o_fm)
e_fm2_path_set(cfdata->o_fm, path, "/"); e_fm2_path_set(cfdata->o_fm, path, "/");
if (cfdata->o_preview) 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) if (cfdata->o_theme_bg)
e_widget_check_checked_set(cfdata->o_theme_bg, 0); e_widget_check_checked_set(cfdata->o_theme_bg, 0);
cfdata->use_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); E_FREE(cfdata->bg);
cfdata->bg = strdup(buf); cfdata->bg = strdup(buf);
if (cfdata->o_preview) 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) if (cfdata->o_theme_bg)
e_widget_check_checked_set(cfdata->o_theme_bg, 0); e_widget_check_checked_set(cfdata->o_theme_bg, 0);
cfdata->use_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; cfdata = data;
if (cfdata->use_theme_bg) 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) 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 else
{ {
if (cfdata->bg) if (cfdata->bg)
{ {
if (cfdata->o_preview) 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) if (cfdata->bg)
f = cfdata->bg; f = cfdata->bg;
else else
f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
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_list_object_append(of, o, 1, 0, 0.5);
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 0, 1, 0, 1); 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) if (cfdata->bg)
f = cfdata->bg; f = cfdata->bg;
else else
f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background"); f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
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_list_object_append(of, o, 1, 0, 0.5);
ol = e_widget_framelist_add(evas, _("Where to place the Wallpaper"), 0); ol = e_widget_framelist_add(evas, _("Where to place the Wallpaper"), 0);

2
src/bin/e_int_config_wallpaper_gradient.c
View File

@ -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" "spectra { spectrum { name: \"gradient\"; color: %d %d %d 255 1; color: %d %d %d 255 1; } }\n"
"collections {\n" "collections {\n"
"group {\n" "group {\n"
"name: \"desktop/background\";\n" "name: \"e/desktop/background\";\n"
"parts {\n" "parts {\n"
"part {\n" "part {\n"
" name: \"gradient\";\n" " name: \"gradient\";\n"

2
src/bin/e_int_shelf_config.c
View File

@ -473,7 +473,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
ob = e_livethumb_add(evas); ob = e_livethumb_add(evas);
e_livethumb_vsize_set(ob, 256, 40); e_livethumb_vsize_set(ob, 256, 40);
oj = edje_object_add(e_livethumb_evas_get(ob)); 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_theme_edje_object_set(oj, "base/theme/shelf", buf);
e_livethumb_thumb_set(ob, oj); e_livethumb_thumb_set(ob, oj);
e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data); e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data);

2
src/bin/e_manager.c
View File

@ -685,7 +685,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
char buf[1024]; char buf[1024];
o = edje_object_add(con->bg_evas); 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); ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
if (ok) if (ok)
{ {

18
src/bin/e_menu.c
View File

@ -1137,7 +1137,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
o = edje_object_add(mi->menu->evas); o = edje_object_add(mi->menu->evas);
mi->separator_object = o; mi->separator_object = o;
e_theme_edje_object_set(o, "base/theme/menus", e_theme_edje_object_set(o, "base/theme/menus",
"widgets/menu/default/separator"); "e/widgets/menu/default/separator");
evas_object_show(o); evas_object_show(o);
edje_object_size_min_calc(mi->separator_object, &ww, &hh); edje_object_size_min_calc(mi->separator_object, &ww, &hh);
mi->separator_w = ww; 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 ((mi->submenu) || (mi->submenu_pre_cb.func))
{ {
if (!e_theme_edje_object_set(mi->bg_object, "base/theme/menus", 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; goto no_submenu_item;
} }
else else
{ {
no_submenu_item: no_submenu_item:
e_theme_edje_object_set(mi->bg_object, "base/theme/menus", 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); evas_object_show(o);
@ -1178,7 +1178,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
o = edje_object_add(mi->menu->evas); o = edje_object_add(mi->menu->evas);
mi->toggle_object = o; mi->toggle_object = o;
e_theme_edje_object_set(o, "base/theme/menus", 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_pass_events_set(o, 1);
evas_object_show(o); evas_object_show(o);
e_box_pack_end(mi->container_object, 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); o = edje_object_add(mi->menu->evas);
mi->toggle_object = o; mi->toggle_object = o;
e_theme_edje_object_set(o, "base/theme/menus", 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_pass_events_set(o, 1);
evas_object_show(o); evas_object_show(o);
e_box_pack_end(mi->container_object, 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); o = edje_object_add(mi->menu->evas);
if (e_theme_edje_object_set(o, "base/theme/menus", if (e_theme_edje_object_set(o, "base/theme/menus",
"widgets/menu/default/icon")) "e/widgets/menu/default/icon"))
{ {
mi->icon_bg_object = o; mi->icon_bg_object = o;
evas_object_show(o); evas_object_show(o);
@ -1307,7 +1307,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
o = edje_object_add(mi->menu->evas); o = edje_object_add(mi->menu->evas);
mi->label_object = o; mi->label_object = o;
e_theme_edje_object_set(o, "base/theme/menus", e_theme_edje_object_set(o, "base/theme/menus",
"widgets/menu/default/label"); "e/widgets/menu/default/label");
/* default label */ /* default label */
edje_object_part_text_set(o, "e.text.label", mi->label); edje_object_part_text_set(o, "e.text.label", mi->label);
evas_object_pass_events_set(o, 1); 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); o = edje_object_add(mi->menu->evas);
mi->submenu_object = o; mi->submenu_object = o;
e_theme_edje_object_set(o, "base/theme/menus", 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_pass_events_set(o, 1);
evas_object_show(o); evas_object_show(o);
e_box_pack_end(mi->container_object, 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_move(o, 0, 0);
evas_object_resize(o, m->cur.w, m->cur.h); evas_object_resize(o, m->cur.w, m->cur.h);
ok = e_theme_edje_object_set(o, "base/theme/menus", ok = e_theme_edje_object_set(o, "base/theme/menus",
"widgets/menu/default/background"); "e/widgets/menu/default/background");
if (ok) if (ok)
{ {
const char *shape_option; const char *shape_option;

4
src/bin/e_moveresize.c
View File

@ -28,7 +28,7 @@ e_resize_begin(E_Zone *zone, int w, int h)
e_popup_layer_set(_disp_pop, 255); e_popup_layer_set(_disp_pop, 255);
_obj = edje_object_add(_disp_pop->evas); _obj = edje_object_add(_disp_pop->evas);
e_theme_edje_object_set(_obj, "base/theme/borders", e_theme_edje_object_set(_obj, "base/theme/borders",
"widgets/border/default/resize"); "e/widgets/border/default/resize");
snprintf(buf, sizeof(buf), "9999x9999"); snprintf(buf, sizeof(buf), "9999x9999");
edje_object_part_text_set(_obj, "e.text.label", buf); 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); _disp_pop = e_popup_new(zone, 0, 0, 1, 1);
_obj = edje_object_add(_disp_pop->evas); _obj = edje_object_add(_disp_pop->evas);
e_theme_edje_object_set(_obj, "base/theme/borders", e_theme_edje_object_set(_obj, "base/theme/borders",
"widgets/border/default/move"); "e/widgets/border/default/move");
snprintf(buf, sizeof(buf), "9999 9999"); snprintf(buf, sizeof(buf), "9999 9999");
edje_object_part_text_set(_obj, "e.text.label", buf); edje_object_part_text_set(_obj, "e.text.label", buf);

4
src/bin/e_pointer.c
View File

@ -322,13 +322,13 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
o = p->pointer_object; o = p->pointer_object;
if (p->color) 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)) if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor))
goto fallback; goto fallback;
} }
else 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)) if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor))
goto fallback; goto fallback;
} }

2
src/bin/e_scrollframe.c
View File

@ -671,7 +671,7 @@ _e_smart_add(Evas_Object *obj)
o = edje_object_add(evas_object_evas_get(obj)); o = edje_object_add(evas_object_evas_get(obj));
sd->edje_obj = o; sd->edje_obj = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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.vbar", _e_smart_edje_drag_v, sd);
edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", _e_smart_edje_drag_h, sd); edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", _e_smart_edje_drag_h, sd);
evas_object_smart_member_add(o, obj); evas_object_smart_member_add(o, obj);

12
src/bin/e_shelf.c
View File

@ -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->o_base = edje_object_add(es->evas);
es->name = evas_stringshare_add(name); 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); evas_object_resize(es->o_base, es->w, es->h);
if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf)) if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf))
e_theme_edje_object_set(es->o_base, "base/theme/shelf", e_theme_edje_object_set(es->o_base, "base/theme/shelf",
"shelf/default/base"); "e/shelf/default/base");
if (es->popup) if (es->popup)
{ {
evas_object_show(es->o_event); 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); es->style = evas_stringshare_add(style);
if (style) if (style)
snprintf(buf, sizeof(buf), "shelf/%s/base", style); snprintf(buf, sizeof(buf), "e/shelf/%s/base", style);
else 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)) if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf))
e_theme_edje_object_set(es->o_base, "base/theme/shelf", e_theme_edje_object_set(es->o_base, "base/theme/shelf",
"shelf/default/base"); "e/shelf/default/base");
} }
EAPI void EAPI void
@ -769,7 +769,7 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl
es = data; es = data;
o = edje_object_add(gcc->gadcon->evas); 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)) if (!e_theme_edje_object_set(o, "base/theme/shelf", buf))
{ {
evas_object_del(o); evas_object_del(o);

6
src/bin/e_slider.c
View File

@ -63,10 +63,10 @@ e_slider_orientation_set(Evas_Object *obj, int horizontal)
sd->horizontal = horizontal; sd->horizontal = horizontal;
if (sd->horizontal) if (sd->horizontal)
e_theme_edje_object_set(sd->edje_obj, "base/theme/widgets", e_theme_edje_object_set(sd->edje_obj, "base/theme/widgets",
"widgets/slider_horizontal"); "e/widgets/slider_horizontal");
else else
e_theme_edje_object_set(sd->edje_obj, "base/theme/widgets", 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)); edje_object_size_min_calc(sd->edje_obj, &(sd->minw), &(sd->minh));
_e_smart_value_update(sd); _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)); sd->edje_obj = edje_object_add(evas_object_evas_get(obj));
e_theme_edje_object_set(sd->edje_obj, "base/theme/widgets", 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)); edje_object_size_min_calc(sd->edje_obj, &(sd->minw), &(sd->minh));
evas_object_smart_member_add(sd->edje_obj, obj); evas_object_smart_member_add(sd->edje_obj, obj);

4
src/bin/e_test.c
View File

@ -194,7 +194,7 @@ _e_test_internal(E_Container *con)
o2 = e_scrollframe_add(dia->win->evas); o2 = e_scrollframe_add(dia->win->evas);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_test_click, o2); 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); evas_object_show(o2);
#if 0 #if 0
o3 = e_pan_add(dia->win->evas); o3 = e_pan_add(dia->win->evas);
@ -297,7 +297,7 @@ _e_test_internal(E_Container *con)
e_livethumb_vsize_set(o3, 160, 96); e_livethumb_vsize_set(o3, 160, 96);
o4 = edje_object_add(e_livethumb_evas_get(o3)); o4 = edje_object_add(e_livethumb_evas_get(o3));
e_theme_edje_object_set(o4, "base/theme/borders", 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_livethumb_thumb_set(o3, o4);
e_ilist_append(o, o3, "Item 1", 0, _e_test_sel, NULL, NULL, NULL); e_ilist_append(o, o3, "Item 1", 0, _e_test_sel, NULL, NULL, NULL);

2
src/bin/e_theme.c
View File

@ -51,7 +51,7 @@ e_theme_init(void)
/* Find transitions */ /* Find transitions */
transitions = _e_theme_collection_items_find("base/theme/transitions", "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"); shelfs = _e_theme_collection_items_find("base/theme/shelf", "shelf");
return 1; return 1;

2
src/bin/e_theme_about.c
View File

@ -44,7 +44,7 @@ e_theme_about_new(E_Container *con)
o = edje_object_add(e_win_evas_get(about->win)); o = edje_object_add(e_win_evas_get(about->win));
about->bg_object = o; about->bg_object = o;
e_theme_edje_object_set(o, "base/theme", e_theme_edje_object_set(o, "base/theme",
"theme/about"); "e/theme/about");
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_show(o); evas_object_show(o);

4
src/bin/e_tlist.c
View File

@ -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. */ /* 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) if (evas_list_count(sd->items) & 0x1)
e_theme_edje_object_set(si->base_obj, "base/theme/widgets", e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"widgets/tlist_odd"); "e/widgets/tlist_odd");
else else
e_theme_edje_object_set(si->base_obj, "base/theme/widgets", e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
"widgets/tlist"); "e/widgets/tlist");
if (si->markup) if (si->markup)
edje_object_part_text_set(si->base_obj, "e.textblock.label", label); edje_object_part_text_set(si->base_obj, "e.textblock.label", label);
else else

4
src/bin/e_utils.c
View File

@ -355,7 +355,7 @@ e_util_edje_icon_set(Evas_Object *obj, const char *name)
char buf[4096]; char buf[4096];
if ((!name) || (!name[0])) return 0; 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); file = e_theme_edje_file_get("base/theme/icons", buf);
if (file[0]) if (file[0])
{ {
@ -372,7 +372,7 @@ e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name)
char buf[4096]; char buf[4096];
if ((!name) || (!name[0])) return 0; 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); file = (char *)e_theme_edje_file_get("base/theme/icons", buf);
if (file[0]) if (file[0])
{ {

2
src/bin/e_widget_button.c
View File

@ -44,7 +44,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_button = o; wd->o_button = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);

4
src/bin/e_widget_check.c
View File

@ -42,7 +42,7 @@ e_widget_check_add(Evas *evas, char *label, int *val)
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_check = o; wd->o_check = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); 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); o = edje_object_add(evas);
wd->o_check = o; wd->o_check = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);

2
src/bin/e_widget_color_well.c
View File

@ -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_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o); e_widget_resize_object_set(obj, o);
e_theme_edje_object_set(o, "base/theme/widgets", 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); edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj);
evas_object_show(o); evas_object_show(o);
wd->o_edje = o; wd->o_edje = o;

2
src/bin/e_widget_cslider.c
View File

@ -60,7 +60,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_cslider = o; wd->o_cslider = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/cslider"); "e/widgets/cslider");
if (wd->vertical) if (wd->vertical)
edje_object_signal_emit(o, "e,state,direction,v", "e"); edje_object_signal_emit(o, "e,state,direction,v", "e");
else else

2
src/bin/e_widget_framelist.c
View File

@ -32,7 +32,7 @@ e_widget_framelist_add(Evas *evas, char *label, int horiz)
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_frame = o; wd->o_frame = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/frame"); "e/widgets/frame");
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);

2
src/bin/e_widget_frametable.c
View File

@ -32,7 +32,7 @@ e_widget_frametable_add(Evas *evas, char *label, int homogenous)
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_frame = o; wd->o_frame = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/frame"); "e/widgets/frame");
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);

4
src/bin/e_widget_iconsel.c
View File

@ -70,7 +70,7 @@ e_widget_iconsel_add(Evas *evas, Evas_Object *icon, Evas_Coord minw, Evas_Coord
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_button = o; wd->o_button = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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_signal_callback_add(o, "click", "", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "label", ""); edje_object_part_text_set(o, "label", "");
evas_object_show(o); 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); o = edje_object_add(evas);
wd->o_button = o; wd->o_button = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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_signal_callback_add(o, "click", "", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "label", ""); edje_object_part_text_set(o, "label", "");
evas_object_show(o); evas_object_show(o);

2
src/bin/e_widget_label.c
View File

@ -27,7 +27,7 @@ e_widget_label_add(Evas *evas, const char *label)
o = edje_object_add(evas); o = edje_object_add(evas);
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/label"); "e/widgets/label");
wd->text = o; wd->text = o;
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);

2
src/bin/e_widget_preview.c
View File

@ -28,7 +28,7 @@ e_widget_preview_add(Evas *evas, int minw, int minh)
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_frame = o; wd->o_frame = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/preview"); "e/widgets/preview");
evas_object_show(o); evas_object_show(o);
e_widget_sub_object_add(obj, o); e_widget_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o); e_widget_resize_object_set(obj, o);

4
src/bin/e_widget_radio.c
View File

@ -59,7 +59,7 @@ e_widget_radio_add(Evas *evas, char *label, int valnum, E_Radio_Group *group)
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_radio = o; wd->o_radio = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); 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); o = edje_object_add(evas);
wd->o_radio = o; wd->o_radio = o;
e_theme_edje_object_set(o, "base/theme/widgets", 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_signal_callback_add(o, "e,action,toggle", "*", _e_wid_signal_cb1, obj);
edje_object_part_text_set(o, "e.text.label", label); edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o); evas_object_show(o);

4
src/bin/e_widget_spectrum.c
View File

@ -54,7 +54,7 @@ e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv)
o = edje_object_add(evas); o = edje_object_add(evas);
wd->o_edje = o; wd->o_edje = o;
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/spectrum"); "e/widgets/spectrum");
evas_object_show(o); evas_object_show(o);
edje_object_size_min_calc(o, &mw, &mh); 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); e_widget_sub_object_add(obj, o);
evas_object_show(o); evas_object_show(o);
wd->o_spectrum = 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); edje_extern_object_min_size_set(o, 100, 100);
o = evas_object_rectangle_add(evas); o = evas_object_rectangle_add(evas);

2
src/bin/e_widget_textblock.c
View File

@ -37,7 +37,7 @@ e_widget_textblock_add(Evas *evas)
o = edje_object_add(evas); o = edje_object_add(evas);
e_theme_edje_object_set(o, "base/theme/widgets", e_theme_edje_object_set(o, "base/theme/widgets",
"widgets/textblock"); "e/widgets/textblock");
wd->o_textblock = o; wd->o_textblock = o;
evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE, _e_wid_cb_scrollframe_resize, wd); 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); e_scrollframe_child_set(wd->o_scrollframe, o);

4
src/bin/e_winlist.c
View File

@ -115,7 +115,7 @@ e_winlist_show(E_Zone *zone)
o = edje_object_add(winlist->evas); o = edje_object_add(winlist->evas);
bg_object = o; bg_object = o;
e_theme_edje_object_set(o, "base/theme/winlist", e_theme_edje_object_set(o, "base/theme/winlist",
"widgets/winlist/main"); "e/widgets/winlist/main");
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_resize(o, w, h); evas_object_resize(o, w, h);
evas_object_show(o); 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); o = edje_object_add(winlist->evas);
ww->bg_object = o; ww->bg_object = o;
e_theme_edje_object_set(o, "base/theme/winlist", 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)); edje_object_part_text_set(o, "e.text.label", e_border_name_get(ww->border));
evas_object_show(o); evas_object_show(o);
if (edje_object_part_exists(ww->bg_object, "e.swallow.icon")) if (edje_object_part_exists(ww->bg_object, "e.swallow.icon"))