vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'everything' theme cleanup 

SVN revision: 41988
This commit is contained in:
Hannes Janetzek 2009-08-25 21:59:46 +00:00
parent 13c6a42821
commit 9e8ceee1bd
3 changed files with 81 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
data/themes/default.edc
View File

@ -26579,7 +26579,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/*** MOD: EVERYTHING ***/ /*** MOD: EVERYTHING ***/
/* #define DROP_SHADOW 1 */ /* #define DROP_SHADOW 1 */
@ -26862,7 +26862,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
description { description {
state: "faded" 0.0; state: "faded" 0.0;
color: 255 255 255 200; color: 255 255 255 120;
} }
} }
part { part {
@ -26871,6 +26871,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
clip_to: "icon_clip"; clip_to: "icon_clip";
description { description {
state: "default" 0.0; state: "default" 0.0;
min: 64 64;
max: 64 64; max: 64 64;
aspect: 1.0 1.0; aspect: 1.0 1.0;
align: 0.0 0.5; align: 0.0 0.5;
@ -26885,6 +26886,28 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
} }
} }
part {
name: "e.swallow.thumb";
type: SWALLOW;
clip_to: "icon_clip";
description {
state: "default" 0.0;
min: 86 64;
max: 86 64;
aspect: 1.0 1.0;
align: 0.0 0.5;
aspect_preference: VERTICAL;
rel1 {
relative: 0.0 0.0;
offset: 15 15;
}
rel2 {
relative: 0.0 0.0;
offset: 100 79;
}
color: 255 255 255 0;
}
}
part { name: "e.text.label"; part { name: "e.text.label";
type: TEXT; type: TEXT;
clip_to: "inner_clip"; clip_to: "inner_clip";
@ -26894,7 +26917,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
description { description {
state: "default" 0.0; state: "default" 0.0;
rel1 { rel1 {
offset: 20 1; offset: 20 6;
relative: 0.0 0.6; relative: 0.0 0.6;
/* to_x: "e.swallow.icons"; */ /* to_x: "e.swallow.icons"; */
} }
@ -26964,9 +26987,24 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
transition: ACCELERATE 0.3; transition: ACCELERATE 0.3;
target: "icon_clip"; target: "icon_clip";
} }
program { name: "thumb_show";
signal: "e,action,thumb,show";
source: "e";
action: STATE_SET "faded" 0.0;
/* transition: SINUSOIDAL 0.05; */
target: "icon_clip";
after: "thumb_show2";
}
program { name: "thumb_show2";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.2;
target: "icon_clip";
}
} }
} }
/////////////////////////////////////////////////////////////////////////////
/*** EVERYTHING LIST POPUP ***/
group { name: "e/modules/everything/list"; group { name: "e/modules/everything/list";
images { images {
image: "base_bg.png" COMP; image: "base_bg.png" COMP;
@ -27536,7 +27574,9 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
} }
} }
/////////////////////////////////////////////////////////////////////////////
/*** EVERYTHING LIST VIEW ***/
group { name: "e/modules/everything/item"; group { name: "e/modules/everything/item";
images { images {
image: "icon_right_arrow.png" COMP; image: "icon_right_arrow.png" COMP;
@ -27759,6 +27799,8 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
} }
/////////////////////////////////////////////////////////////////////////////
/*** EVERYTHING PREVIEW ***/
group { name: "e/modules/everything/preview"; group { name: "e/modules/everything/preview";
parts { parts {
part { name: "bg"; part { name: "bg";
@ -27894,11 +27936,8 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
} }
/////////////////////////////////////////////////////////////////////////////
/*** EVERYTHING THUMB VIEW ***/
/////////////////////////////////////////////////////////////////////////////
/*** WALLPAPER MAIN DIALOG ***/
group { name: "e/modules/everything/thumbview/main/window"; group { name: "e/modules/everything/thumbview/main/window";
images { images {
image: "vgrad_dark.png" COMP; image: "vgrad_dark.png" COMP;
@ -27937,14 +27976,9 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -1 6; offset: -1 6;
/* to_y: "bot1"; */
} }
fill { fill {
smooth: 0; smooth: 0;
/* size {
* relative: 0.0 1.0;
* offset: 64 0;
* } */
} }
} }
} }
@ -27969,7 +28003,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
rel2 { rel2 {
relative: 1.0 1.0; relative: 1.0 1.0;
offset: -3 -3; offset: -3 -3;
/* to_y: "bot1"; */
} }
} }
} }
@ -28080,7 +28113,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
part { name: "bg"; part { name: "bg";
mouse_events: 0; mouse_events: 0;
description { state: "default" 0.0; description { state: "default" 0.0;
/* visible: 0; */
rel1 { rel1 {
to: "base"; to: "base";
offset: -1 -3; offset: -1 -3;
@ -28096,7 +28128,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
color: 255 255 255 32; color: 255 255 255 32;
} }
description { state: "visible" 0.0; description { state: "selected" 0.0;
inherit: "default" 0.0; inherit: "default" 0.0;
color: 255 255 255 128; color: 255 255 255 128;
} }
@ -28122,8 +28154,22 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
color: 255 255 255 255; color: 255 255 255 255;
} }
} }
part { name: "e.swallow.content"; part { name: "clip";
clip_to: "base"; mouse_events: 0;
type: RECT;
/* clip_to: "base"; */
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
color: 235 235 235 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
part { name: "e.swallow.icon";
clip_to: "clip";
type: SWALLOW; type: SWALLOW;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1 { rel1 {
@ -28138,8 +28184,8 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
} }
} }
part { name: "e.swallow.icon"; part { name: "e.swallow.thumb";
clip_to: "base"; clip_to: "clip";
type: SWALLOW; type: SWALLOW;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1 { rel1 {
@ -28177,26 +28223,15 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
} }
} }
} }
part { name: "events";
type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
} }
programs { programs {
program { name: "sel"; program { name: "sel";
signal: "e,state,selected"; signal: "e,state,selected";
source: "e"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "selected" 0.0;
transition: DECELERATE 0.1; transition: DECELERATE 0.1;
target: "bg"; target: "bg";
target: "clip";
} }
program { name: "unsel"; program { name: "unsel";
signal: "e,state,unselected"; signal: "e,state,unselected";
@ -28204,6 +28239,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.2; transition: SINUSOIDAL 0.2;
target: "bg"; target: "bg";
target: "clip";
} }
program { name: "thumb_gen"; program { name: "thumb_gen";
signal: "e,action,thumb,gen"; signal: "e,action,thumb,gen";

15
src/modules/everything/evry_view_plugin_tabs.c
View File

@ -7,6 +7,8 @@ struct _Tab
{ {
Evry_Plugin *plugin; Evry_Plugin *plugin;
Evas_Object *o_tab; Evas_Object *o_tab;
int cw, mw;
}; };
@ -58,7 +60,7 @@ _tabs_update(Tab_View *v)
Evry_Plugin *p; Evry_Plugin *p;
const Evry_State *s = v->state; const Evry_State *s = v->state;
Tab *tab; Tab *tab;
Evas_Coord mw, cw, w; Evas_Coord w;
Evas_Object *o; Evas_Object *o;
evas_object_geometry_get(v->o_tabs, NULL, NULL, &w, NULL); evas_object_geometry_get(v->o_tabs, NULL, NULL, &w, NULL);
@ -78,7 +80,7 @@ _tabs_update(Tab_View *v)
EINA_LIST_FOREACH(v->tabs, ll, tab) EINA_LIST_FOREACH(v->tabs, ll, tab)
if (tab->plugin == p) break; if (tab->plugin == p) break;
if (!tab && (strlen(p->name) > 0)) if (!tab)
{ {
tab = E_NEW(Tab, 1); tab = E_NEW(Tab, 1);
tab->plugin = p; tab->plugin = p;
@ -90,6 +92,9 @@ _tabs_update(Tab_View *v)
tab->o_tab = o; tab->o_tab = o;
edje_object_size_min_calc(o, &tab->cw, NULL);
edje_object_size_min_get(o, &tab->mw, NULL);
v->tabs = eina_list_append(v->tabs, tab); v->tabs = eina_list_append(v->tabs, tab);
} }
@ -99,11 +104,8 @@ _tabs_update(Tab_View *v)
evas_object_show(o); evas_object_show(o);
e_box_pack_end(v->o_tabs, o); e_box_pack_end(v->o_tabs, o);
edje_object_size_min_calc(o, &cw, NULL);
edje_object_size_min_get(o, &mw, NULL);
e_box_pack_options_set(o, 1, 1, 1, 0, 0.0, 0.5, e_box_pack_options_set(o, 1, 1, 1, 0, 0.0, 0.5,
(mw < cw ? cw : mw), 10, (tab->mw < tab->cw ? tab->cw : tab->mw), 10,
(w ? w/3 : 150), 9999); (w ? w/3 : 150), 9999);
if (s->plugin == p) if (s->plugin == p)
edje_object_signal_emit(o, "e,state,selected", "e"); edje_object_signal_emit(o, "e,state,selected", "e");
@ -298,6 +300,7 @@ evry_tab_view_free(Tab_View *v)
EINA_LIST_FREE(v->tabs, tab) EINA_LIST_FREE(v->tabs, tab)
{ {
e_box_unpack(tab->o_tab);
evas_object_del(tab->o_tab); evas_object_del(tab->o_tab);
E_FREE(tab); E_FREE(tab);
} }

4
src/modules/everything/views/evry_plug_view_thumb.c
View File

@ -70,7 +70,7 @@ _thumb_gen(void *data, Evas_Object *obj, void *event_info)
e_icon_size_get(it->thumb, &w, &h); e_icon_size_get(it->thumb, &w, &h);
edje_extern_object_aspect_set(it->thumb, EDJE_ASPECT_CONTROL_BOTH, w, h); edje_extern_object_aspect_set(it->thumb, EDJE_ASPECT_CONTROL_BOTH, w, h);
edje_object_part_swallow(it->frame, "e.swallow.icon", it->thumb); edje_object_part_swallow(it->frame, "e.swallow.thumb", it->thumb);
evas_object_show(it->thumb); evas_object_show(it->thumb);
it->have_thumb = EINA_TRUE; it->have_thumb = EINA_TRUE;
it->do_thumb = EINA_FALSE; it->do_thumb = EINA_FALSE;
@ -333,7 +333,7 @@ _e_smart_reconfigure_do(void *data)
it->image = it->item->plugin->icon_get it->image = it->item->plugin->icon_get
(it->item->plugin, it->item, sd->view->evas); (it->item->plugin, it->item, sd->view->evas);
edje_object_part_swallow(it->frame, "e.swallow.content", it->image); edje_object_part_swallow(it->frame, "e.swallow.icon", it->image);
evas_object_show(it->image); evas_object_show(it->image);
} }
} }