discomfitor pushed a commit to branch devs/discomfitor/comp-border.
commit f8bcd5d06664b9eb0835cb99e3481c7e385ad7ea
Author: Mike Blumenkrantz <[email protected]>
Date: Mon Mar 4 07:55:48 2013 +0000
move comp border edje groups from e/comp/* to e/comp/border/*
---
data/themes/edc/comp.edc | 62 ++++++++++++++---------------
src/bin/e_comp.c | 24 +++++------
src/bin/e_theme.c | 8 ++--
src/bin/e_theme.h | 4 +-
src/modules/conf_comp/e_mod_main.c | 4 +-
src/modules/conf_theme/e_int_config_scale.c | 2 +-
src/modules/conf_theme/e_int_config_theme.c | 6 +--
src/modules/wizard/page_050.c | 2 +-
8 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 10ef095..3b5f3b7 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -547,7 +547,7 @@ group { name: "e/comp/effects/zoom";
}
}
-group { name: "e/comp/default";
+group { name: "e/comp/border/default";
images.image: "win_shadow.png" COMP;
images.image: "win_glow.png" COMP;
parts {
@@ -732,8 +732,8 @@ group { name: "e/comp/default";
}
}
-group { name: "e/comp/rotate";
- inherit: "e/comp/default";
+group { name: "e/comp/border/rotate";
+ inherit: "e/comp/border/default";
parts {
part { name: "e.swallow.content";
description { state: "default";
@@ -773,8 +773,8 @@ group { name: "e/comp/rotate";
}
}
-group { name: "e/comp/rotate/fast";
- inherit: "e/comp/rotate";
+group { name: "e/comp/border/rotate/fast";
+ inherit: "e/comp/border/rotate";
programs {
program { name: "focus3";
transition: LINEAR 0;
@@ -785,8 +785,8 @@ group { name: "e/comp/rotate/fast";
}
}
-group { name: "e/comp/flip";
- inherit: "e/comp/rotate";
+group { name: "e/comp/border/flip";
+ inherit: "e/comp/border/rotate";
parts {
part { name: "e.swallow.content";
description { state: "default";
@@ -810,8 +810,8 @@ group { name: "e/comp/flip";
}
}
-group { name: "e/comp/flip/fast";
- inherit: "e/comp/flip";
+group { name: "e/comp/border/flip/fast";
+ inherit: "e/comp/border/flip";
programs {
program { name: "focus3";
transition: LINEAR 0;
@@ -822,8 +822,8 @@ group { name: "e/comp/flip/fast";
}
}
-group { name: "e/comp/popup";
- inherit: "e/comp/default";
+group { name: "e/comp/border/popup";
+ inherit: "e/comp/border/default";
parts {
part { name: "focus-clipper";
description { state: "default";
@@ -833,8 +833,8 @@ group { name: "e/comp/popup";
}
}
-group { name: "e/comp/default/fast";
- inherit: "e/comp/default";
+group { name: "e/comp/border/default/fast";
+ inherit: "e/comp/border/default";
programs {
program {
name: "visible_on";
@@ -863,8 +863,8 @@ group { name: "e/comp/default/fast";
}
}
-group { name: "e/comp/popup/fast";
- inherit: "e/comp/default/fast";
+group { name: "e/comp/border/popup/fast";
+ inherit: "e/comp/border/default/fast";
parts {
part { name: "focus-clipper";
description { state: "default";
@@ -874,7 +874,7 @@ group { name: "e/comp/popup/fast";
}
}
-group { name: "e/comp/none";
+group { name: "e/comp/border/none";
parts {
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
@@ -893,8 +893,8 @@ group { name: "e/comp/none";
}
}
-group { name: "e/comp/still";
- inherit: "e/comp/default";
+group { name: "e/comp/border/still";
+ inherit: "e/comp/border/default";
parts {
part { name: "shower";
description { state: "default" 0.0;
@@ -905,8 +905,8 @@ group { name: "e/comp/still";
}
}
-group { name: "e/comp/still/fast";
- inherit: "e/comp/default/fast";
+group { name: "e/comp/border/still/fast";
+ inherit: "e/comp/border/default/fast";
parts {
part { name: "shower";
description { state: "default" 0.0;
@@ -917,8 +917,8 @@ group { name: "e/comp/still/fast";
}
}
-group { name: "e/comp/menu";
- inherit: "e/comp/popup";
+group { name: "e/comp/border/menu";
+ inherit: "e/comp/border/popup";
parts {
part { name: "shower";
description { state: "default" 0.0;
@@ -929,8 +929,8 @@ group { name: "e/comp/menu";
}
}
-group { name: "e/comp/menu/fast";
- inherit: "e/comp/popup/fast";
+group { name: "e/comp/border/menu/fast";
+ inherit: "e/comp/border/popup/fast";
parts {
part { name: "shower";
description { state: "default" 0.0;
@@ -941,8 +941,8 @@ group { name: "e/comp/menu/fast";
}
}
-group { name: "e/comp/everything";
- inherit: "e/comp/popup";
+group { name: "e/comp/border/everything";
+ inherit: "e/comp/border/popup";
parts {
part { name: "shower";
description { state: "default" 0.0;
@@ -953,8 +953,8 @@ group { name: "e/comp/everything";
}
}
-group { name: "e/comp/everything/fast";
- inherit: "e/comp/popup/fast";
+group { name: "e/comp/border/everything/fast";
+ inherit: "e/comp/border/popup/fast";
parts {
part { name: "shower";
description { state: "default" 0.0;
@@ -965,7 +965,7 @@ group { name: "e/comp/everything/fast";
}
}
-group { name: "e/comp/fullscreen";
+group { name: "e/comp/border/fullscreen";
images.image: "win_shadow.png" COMP;
images.image: "screen_circular_shadow.png" COMP;
data.item: "screen.bg" "fullscreen.bg";
@@ -1181,8 +1181,8 @@ group { name: "e/comp/fullscreen";
}
}
-group { name: "e/comp/fullscreen/fast";
- inherit: "e/comp/fullscreen";
+group { name: "e/comp/border/fullscreen/fast";
+ inherit: "e/comp/border/fullscreen";
programs {
program {
name: "visible_on";
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index a662315..3d4ee2d 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1765,14 +1765,14 @@ _e_comp_win_shadow_setup(E_Comp_Win *cw)
{
if (fast)
{
- snprintf(buf, sizeof(buf), "e/comp/%s/fast",
m->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s/fast",
m->shadow_style);
reshadow = ok = !e_util_strcmp(reshadow_group, buf);
if (!ok)
ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", buf);
}
if (!ok)
{
- snprintf(buf, sizeof(buf), "e/comp/%s",
m->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s",
m->shadow_style);
reshadow = ok = !e_util_strcmp(reshadow_group, buf);
if (!ok)
ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", buf);
@@ -1785,23 +1785,23 @@ _e_comp_win_shadow_setup(E_Comp_Win *cw)
{
if (skip || (cw->bd && cw->bd->client.e.state.video))
{
- reshadow = ok = !e_util_strcmp(reshadow_group, "e/comp/none");
+ reshadow = ok = !e_util_strcmp(reshadow_group,
"e/comp/border/none");
if (!ok)
- ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders",
"e/comp/none");
+ ok = e_theme_edje_object_set(cw->shobj, "base/theme/borders",
"e/comp/border/none");
}
if (ok) break;
if (conf->shadow_style)
{
if (fast)
{
- snprintf(buf, sizeof(buf), "e/comp/%s/fast",
conf->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s/fast",
conf->shadow_style);
reshadow = ok = !e_util_strcmp(reshadow_group, buf);
if (!ok)
ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", buf);
}
if (!ok)
{
- snprintf(buf, sizeof(buf), "e/comp/%s", conf->shadow_style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s",
conf->shadow_style);
reshadow = ok = !e_util_strcmp(reshadow_group, buf);
if (!ok)
ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", buf);
@@ -1811,15 +1811,15 @@ _e_comp_win_shadow_setup(E_Comp_Win *cw)
{
if (fast)
{
- reshadow = ok = !e_util_strcmp(reshadow_group,
"e/comp/default/fast");
+ reshadow = ok = !e_util_strcmp(reshadow_group,
"e/comp/border/default/fast");
if (!ok)
- ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", "e/comp/default/fast");
+ ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", "e/comp/border/default/fast");
}
if (!ok)
{
- reshadow = ok = !e_util_strcmp(reshadow_group,
"e/comp/default");
+ reshadow = ok = !e_util_strcmp(reshadow_group,
"e/comp/border/default");
if (!ok)
- ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", "e/comp/default");
+ ok = e_theme_edje_object_set(cw->shobj,
"base/theme/borders", "e/comp/border/default");
}
}
break;
@@ -4421,7 +4421,7 @@ _e_comp_config_style_thumb_cb(E_Configure_Option_Info
*oi, Evas *evas)
evas_object_show(oly);
oo = edje_object_add(e_livethumb_evas_get(ob));
- snprintf(buf, sizeof(buf), "e/comp/%s", oi->name);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s", oi->name);
e_theme_edje_object_set(oo, "base/theme/borders", buf);
e_layout_pack(oly, oo);
e_layout_child_move(oo, 39, 39);
@@ -4464,7 +4464,7 @@ _e_comp_config_style_info_cb(E_Configure_Option *co)
Eina_Stringshare *style;
E_Configure_Option_Info *oi;
- styles = e_theme_comp_list();
+ styles = e_theme_comp_border_list();
EINA_LIST_FREE(styles, style)
{
oi = e_configure_option_info_new(co, style, style);
diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c
index 2f8c4e6..8ed8686 100644
--- a/src/bin/e_theme.c
+++ b/src/bin/e_theme.c
@@ -489,13 +489,13 @@ e_theme_shelf_list(void)
}
EAPI int
-e_theme_comp_find(const char *comp)
+e_theme_comp_border_find(const char *comp)
{
Eina_List *comps = NULL;
int found = 0;
const char *str;
- comps = _e_theme_collection_items_find("base/theme/borders", "e/comp");
+ comps = _e_theme_collection_items_find("base/theme/borders",
"e/comp/border");
if (eina_list_search_sorted(comps, EINA_COMPARE_CB(strcmp), comp))
found = 1;
@@ -507,9 +507,9 @@ e_theme_comp_find(const char *comp)
}
EAPI Eina_List *
-e_theme_comp_list(void)
+e_theme_comp_border_list(void)
{
- return _e_theme_collection_items_find("base/theme/borders", "e/comp");
+ return _e_theme_collection_items_find("base/theme/borders",
"e/comp/border");
}
/* local subsystem functions */
diff --git a/src/bin/e_theme.h b/src/bin/e_theme.h
index 6a508bd..0396175 100644
--- a/src/bin/e_theme.h
+++ b/src/bin/e_theme.h
@@ -24,8 +24,8 @@ EAPI int e_theme_border_find(const char *border);
EAPI Eina_List *e_theme_border_list(void);
EAPI int e_theme_shelf_find(const char *shelf);
EAPI Eina_List *e_theme_shelf_list(void);
-EAPI int e_theme_comp_find(const char *shelf);
-EAPI Eina_List *e_theme_comp_list(void);
+EAPI int e_theme_comp_border_find(const char *theme);
+EAPI Eina_List *e_theme_comp_border_list(void);
#endif
#endif
diff --git a/src/modules/conf_comp/e_mod_main.c
b/src/modules/conf_comp/e_mod_main.c
index 6ff0380..e3d53b3 100644
--- a/src/modules/conf_comp/e_mod_main.c
+++ b/src/modules/conf_comp/e_mod_main.c
@@ -133,7 +133,7 @@ _style_selector(Evas *evas, const char **source)
evas_object_event_callback_add(oi, EVAS_CALLBACK_DEL,
_style_selector_del, oi);
sel = 0;
- styles = e_theme_comp_list();
+ styles = e_theme_comp_border_list();
n = 0;
EINA_LIST_FOREACH(styles, l, style)
{
@@ -154,7 +154,7 @@ _style_selector(Evas *evas, const char **source)
oo = edje_object_add(e_livethumb_evas_get(ob));
ds_it->preview = oo;
- snprintf(buf, sizeof(buf), "e/comp/%s", style);
+ snprintf(buf, sizeof(buf), "e/comp/border/%s", style);
e_theme_edje_object_set(oo, "base/theme/borders", buf);
e_layout_pack(oly, oo);
e_layout_child_move(oo, 39, 39);
diff --git a/src/modules/conf_theme/e_int_config_scale.c
b/src/modules/conf_theme/e_int_config_scale.c
index 2b0aa84..6e22b18 100644
--- a/src/modules/conf_theme/e_int_config_scale.c
+++ b/src/modules/conf_theme/e_int_config_scale.c
@@ -106,7 +106,7 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e,
double sc, double *scp
evas_object_show(bg);
cm = edje_object_add(e_widget_preview_evas_get(ob));
- e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/default");
+ e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/border/default");
evas_object_move(cm, 16, 16);
evas_object_resize(cm, 180 * sc, 70);
evas_object_show(cm);
diff --git a/src/modules/conf_theme/e_int_config_theme.c
b/src/modules/conf_theme/e_int_config_theme.c
index 05fedd2..5a0e836 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -125,7 +125,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char
*file)
objs = eina_list_append(objs, o);
o = edje_object_add(e);
- _e_int_theme_edje_file_set(o, file, "e/comp/popup");
+ _e_int_theme_edje_file_set(o, file, "e/comp/border/popup");
evas_object_move(o, (w - (400 * e_scale)) / 2, h - (40 * e_scale));
evas_object_resize(o, 400 * e_scale, (40 * e_scale));
evas_object_show(o);
@@ -233,7 +233,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char
*file)
o = edje_object_add(e);
- _e_int_theme_edje_file_set(o, file, "e/comp/default");
+ _e_int_theme_edje_file_set(o, file, "e/comp/border/default");
evas_object_move(o, w / 2, h / 9);
evas_object_resize(o, w / 3, h / 3);
evas_object_show(o);
@@ -267,7 +267,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char
*file)
o = edje_object_add(e);
- _e_int_theme_edje_file_set(o, file, "e/comp/default");
+ _e_int_theme_edje_file_set(o, file, "e/comp/border/default");
evas_object_move(o, w / 10, h / 5);
evas_object_resize(o, w / 2, h / 3);
evas_object_show(o);
diff --git a/src/modules/wizard/page_050.c b/src/modules/wizard/page_050.c
index e16bad6..ceddfee 100644
--- a/src/modules/wizard/page_050.c
+++ b/src/modules/wizard/page_050.c
@@ -71,7 +71,7 @@ _scale_preview_new(Evas *e, double sc, double *scp)
evas_object_show(bg);
cm = edje_object_add(e_widget_preview_evas_get(ob));
- e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/default");
+ e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/border/default");
evas_object_move(cm, 16, 16);
evas_object_resize(cm, 180 * sc, 80);
evas_object_show(cm);
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
