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

asparagus - pass distcheck. 

SVN revision: 29865
This commit is contained in:
Carsten Haitzler 2007-05-05 15:14:17 +00:00
parent de9dc67513
commit a9e83652ab
16 changed files with 30006 additions and 24189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -5,7 +5,7 @@ AC_INIT(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
AM_INIT_AUTOMAKE(enlightenment, 0.16.999.037)
AM_INIT_AUTOMAKE(enlightenment, 0.16.999.038)
AM_CONFIG_HEADER(config.h)
AC_C_BIGENDIAN

457
data/themes/default_fileman.edc
View File

@ -236,6 +236,7 @@ group {
to: "icon_box";
relative: 0.0 0.0;
offset: 1 1;
}
rel2 {
to: "icon_box";
@ -1389,6 +1390,7 @@ group {
}
}
/*
group {
name: "e/fileman/list/variable";
parts {
@ -2739,6 +2741,7 @@ group {
}
}
}
*/
group {
name: "e/fileman/icon/fixed";
@ -2768,6 +2771,167 @@ group {
color: 255 255 255 255;
}
}
part {
name: "icon_box_shadow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "icon_box";
relative: 0.0 0.0;
offset: -1 -1;
}
rel2 {
to: "icon_box";
relative: 1.0 1.0;
offset: 2 2;
}
image {
normal: "e17_mini_button_shadow2.png";
border: 6 6 6 6;
}
}
description {
state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part {
name: "icon_box";
type: RECT;
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
align: 0.5 0.5;
rel1 {
to: "e.swallow.icon";
relative: 0.0 0.0;
offset: -1 -1;
}
rel2 {
to: "e.swallow.icon";
relative: 1.0 1.0;
offset: 0 0;
}
color: 0 0 0 64;
}
description {
state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part {
name: "icon_box_bg";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "icon_box";
relative: 0.0 0.0;
offset: 1 1;
}
rel2 {
to: "icon_box";
relative: 1.0 1.0;
offset: -2 -2;
}
image {
normal: "e17_fileman_thumb_bg.png";
}
fill {
smooth: 0;
size {
relative: 0 0;
offset: 32 32;
}
}
}
description {
state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part {
name: "icon0";
type: RECT;
mouse_events: 0;
description {
state: "default" 0.0;
align: 0.0 0.5;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
visible: 0;
rel1 {
relative: 0.0 0.0;
offset: 8 8;
}
rel2 {
to_y: "e.text.label";
relative: 1.0 0.0;
offset: -9 -2;
}
color: 0 0 0 0;
}
}
part {
name: "icon";
type: RECT;
mouse_events: 0;
description {
state: "default" 0.0;
align: 0.5 0.5;
aspect: 1.0 1.0;
aspect_preference: BOTH;
visible: 0;
rel1 {
to: "icon0";
}
rel2 {
to: "icon0";
}
color: 0 0 0 0;
}
description {
state: "min" 0.0;
inherit: "default" 0.0;
max: 0 0;
}
description {
state: "max" 0.0;
inherit: "default" 0.0;
rel1 {
to: "icon0";
relative: 0.0 0.0;
offset: -4 -4;
}
rel2 {
to: "icon0";
relative: 1.0 1.0;
offset: 3 3;
}
}
description {
state: "max2" 0.0;
inherit: "default" 0.0;
rel1 {
to: "icon0";
relative: 0.0 0.0;
offset: -2 -2;
}
rel2 {
to: "icon0";
relative: 1.0 1.0;
offset: 1 1;
}
}
}
part {
name: "e.swallow.icon";
type: SWALLOW;
@ -2775,14 +2939,13 @@ group {
state: "default" 0.0;
aspect: 1.0 1.0;
aspect_preference: BOTH;
align: 0.5 0.5;
// fixed: 1 1;
rel1 {
relative: 0.0 0.0;
offset: 4 4;
to: "icon";
}
rel2 {
to_y: "e.text.label";
relative: 1.0 0.0;
offset: -5 -2;
to: "icon";
}
}
}
@ -2797,11 +2960,11 @@ group {
fixed: 0 1;
rel1 {
relative: 0.0 1.0;
offset: 4 -5;
offset: 8 -9;
}
rel2 {
relative: 1.0 1.0;
offset: -5 -5;
offset: -9 -9;
}
color: 0 0 0 255;
color3: 255 255 255 128;
@ -2845,6 +3008,59 @@ group {
target: "e.text.label";
target: "icon_overlay";
}
program {
name: "thumb_gen";
signal: "e,action,thumb,gen";
source: "e";
action: STATE_SET "visible" 0.0;
target: "icon_box_shadow";
target: "icon_box";
target: "icon_box_bg";
after: "thumb_gen2";
}
program {
name: "thumb_gen-";
signal: "e,action,thumb,gen,alpha";
source: "e";
action: STATE_SET "default" 0.0;
target: "icon_box_shadow";
target: "icon_box";
target: "icon_box_bg";
after: "thumb_gen2";
}
program {
name: "thumb_gen2";
action: STATE_SET "min" 0.0;
target: "icon";
after: "thumb_gen3";
}
program {
name: "thumb_gen3";
action: STATE_SET "max" 0.0;
target: "icon";
transition: DECELERATE 0.2;
after: "thumb_gen4";
}
program {
name: "thumb_gen4";
action: STATE_SET "default" 0.0;
target: "icon";
transition: SINUSOIDAL 0.1;
after: "thumb_gen5";
}
program {
name: "thumb_gen5";
action: STATE_SET "max2" 0.0;
target: "icon";
transition: SINUSOIDAL 0.2;
after: "thumb_gen6";
}
program {
name: "thumb_gen6";
action: STATE_SET "default" 0.0;
target: "icon";
transition: SINUSOIDAL 0.3;
}
}
}
@ -2876,6 +3092,167 @@ group {
color: 255 255 255 255;
}
}
part {
name: "icon_box_shadow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "icon_box";
relative: 0.0 0.0;
offset: -1 -1;
}
rel2 {
to: "icon_box";
relative: 1.0 1.0;
offset: 2 2;
}
image {
normal: "e17_mini_button_shadow2.png";
border: 6 6 6 6;
}
}
description {
state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part {
name: "icon_box";
type: RECT;
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
align: 0.5 0.5;
rel1 {
to: "e.swallow.icon";
relative: 0.0 0.0;
offset: -1 -1;
}
rel2 {
to: "e.swallow.icon";
relative: 1.0 1.0;
offset: 0 0;
}
color: 0 0 0 64;
}
description {
state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part {
name: "icon_box_bg";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "icon_box";
relative: 0.0 0.0;
offset: 1 1;
}
rel2 {
to: "icon_box";
relative: 1.0 1.0;
offset: -2 -2;
}
image {
normal: "e17_fileman_thumb_bg.png";
}
fill {
smooth: 0;
size {
relative: 0 0;
offset: 32 32;
}
}
}
description {
state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part {
name: "icon0";
type: RECT;
mouse_events: 0;
description {
state: "default" 0.0;
align: 0.5 0.5;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
visible: 0;
rel1 {
relative: 0.0 0.0;
offset: 8 8;
}
rel2 {
to_y: "e.text.label";
relative: 1.0 0.0;
offset: -9 -2;
}
color: 0 0 0 0;
}
}
part {
name: "icon";
type: RECT;
mouse_events: 0;
description {
state: "default" 0.0;
align: 0.5 0.5;
aspect: 1.0 1.0;
aspect_preference: BOTH;
visible: 0;
rel1 {
to: "icon0";
}
rel2 {
to: "icon0";
}
color: 0 0 0 0;
}
description {
state: "min" 0.0;
inherit: "default" 0.0;
max: 0 0;
}
description {
state: "max" 0.0;
inherit: "default" 0.0;
rel1 {
to: "icon0";
relative: 0.0 0.0;
offset: -4 -4;
}
rel2 {
to: "icon0";
relative: 1.0 1.0;
offset: 3 3;
}
}
description {
state: "max2" 0.0;
inherit: "default" 0.0;
rel1 {
to: "icon0";
relative: 0.0 0.0;
offset: -2 -2;
}
rel2 {
to: "icon0";
relative: 1.0 1.0;
offset: 1 1;
}
}
}
part {
name: "e.swallow.icon";
type: SWALLOW;
@ -2883,14 +3260,13 @@ group {
state: "default" 0.0;
aspect: 1.0 1.0;
aspect_preference: BOTH;
align: 0.5 0.5;
// fixed: 1 1;
rel1 {
relative: 0.0 0.0;
offset: 4 4;
to: "icon";
}
rel2 {
to_y: "e.text.label";
relative: 1.0 0.0;
offset: -5 -2;
to: "icon";
}
}
}
@ -2905,11 +3281,11 @@ group {
fixed: 0 1;
rel1 {
relative: 0.0 1.0;
offset: 4 -5;
offset: 8 -9;
}
rel2 {
relative: 1.0 1.0;
offset: -5 -5;
offset: -9 -9;
}
color: 0 0 0 255;
color3: 255 255 255 128;
@ -2953,6 +3329,59 @@ group {
target: "e.text.label";
target: "icon_overlay";
}
program {
name: "thumb_gen";
signal: "e,action,thumb,gen";
source: "e";
action: STATE_SET "visible" 0.0;
target: "icon_box_shadow";
target: "icon_box";
target: "icon_box_bg";
after: "thumb_gen2";
}
program {
name: "thumb_gen-";
signal: "e,action,thumb,gen,alpha";
source: "e";
action: STATE_SET "default" 0.0;
target: "icon_box_shadow";
target: "icon_box";
target: "icon_box_bg";
after: "thumb_gen2";
}
program {
name: "thumb_gen2";
action: STATE_SET "min" 0.0;
target: "icon";
after: "thumb_gen3";
}
program {
name: "thumb_gen3";
action: STATE_SET "max" 0.0;
target: "icon";
transition: DECELERATE 0.2;
after: "thumb_gen4";
}
program {
name: "thumb_gen4";
action: STATE_SET "default" 0.0;
target: "icon";
transition: SINUSOIDAL 0.1;
after: "thumb_gen5";
}
program {
name: "thumb_gen5";
action: STATE_SET "max2" 0.0;
target: "icon";
transition: SINUSOIDAL 0.2;
after: "thumb_gen6";
}
program {
name: "thumb_gen6";
action: STATE_SET "default" 0.0;
target: "icon";
transition: SINUSOIDAL 0.3;
}
}
}

2
data/themes/images/Makefile.am
View File

@ -418,6 +418,8 @@ e17_icon_window_focus.png \
e17_icon_window_manipulation.png \
e17_icon_windows.png \
e17_icon_winlist.png \
e17_icon_power_management.png \
e17_icon_screensaver.png \
e17_ilist_bg0.png \
e17_ilist_bg1.png \
e17_logo.png \

8011
po/bg.po
View File

File diff suppressed because it is too large Load Diff

1593
po/de.po
View File

File diff suppressed because it is too large Load Diff

1562
po/eo.po
View File

File diff suppressed because it is too large Load Diff

1606
po/fr.po
View File

File diff suppressed because it is too large Load Diff

1703
po/hu.po
View File

File diff suppressed because it is too large Load Diff

8618
po/it.po
View File

File diff suppressed because it is too large Load Diff

666
po/ja.po
View File

File diff suppressed because it is too large Load Diff

7777
po/ko.po
View File

File diff suppressed because it is too large Load Diff

10594
po/pt_BR.po
View File

File diff suppressed because it is too large Load Diff

9796
po/ru.po
View File

File diff suppressed because it is too large Load Diff

1695
po/sl.po
View File

File diff suppressed because it is too large Load Diff

89
src/bin/e_fm.c
View File

@ -2013,6 +2013,7 @@ _e_fm2_icons_place_icons(E_Fm2_Smart_Data *sd)
if (ic->h > rh) rh = ic->h;
if ((ic->x + ic->w) > sd->max.w) sd->max.w = ic->x + ic->w;
if ((ic->y + ic->h) > sd->max.h) sd->max.h = ic->y + ic->h;
// printf("BLAH %s - %i %i %ix%i\n", ic->info.file, ic->x, ic->y, ic->w, ic->h);
}
}
@ -2372,25 +2373,36 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
* fileman/list_odd/fixed
* fileman/list_odd/variable
*
* and now list other things i will need
*
* fileman/background
* fileman/selection
* fileman/scrollframe
*
*/
// printf("CALC ICON\n");
if ((!ic->sd->config->icon.fixed.w) || (!ic->sd->config->icon.fixed.h))
{
obj = ic->sd->tmp.obj;
if (!obj)
{
obj = edje_object_add(evas_object_evas_get(ic->sd->obj));
_e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/icon/variable");
if ((ic->sd->config->icon.fixed.w) && (ic->sd->config->icon.fixed.h))
_e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/icon/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/icon/variable");
ic->sd->tmp.obj = obj;
// printf("CALC OBJ %p\n", ic->sd->tmp.obj);
}
_e_fm2_icon_label_set(ic, obj);
obj2 = ic->sd->tmp.obj2;
if (!obj2)
{
obj2 = evas_object_rectangle_add(evas_object_evas_get(ic->sd->obj));
ic->sd->tmp.obj2 = obj2;
}
/* FIXME: if icons are allowed to have their own size - use it */
edje_extern_object_min_size_set(obj2, ic->sd->config->icon.icon.w, ic->sd->config->icon.icon.h);
edje_extern_object_max_size_set(obj2, ic->sd->config->icon.icon.w, ic->sd->config->icon.icon.h);
edje_object_part_swallow(obj, "e.swallow.icon", obj2);
edje_object_size_min_calc(obj, &mw, &mh);
// printf("CALC %ix%i\n", mw, mh);
}
ic->w = mw;
ic->h = mh;
@ -2405,12 +2417,13 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
if (!obj)
{
obj = edje_object_add(evas_object_evas_get(ic->sd->obj));
if (ic->sd->config->icon.fixed.w)
// vairable sized list items are pretty usless - ignore.
// if (ic->sd->config->icon.fixed.w)
_e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/list/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
"e/fileman/list/variable");
// else
// _e_fm2_theme_edje_object_set(ic->sd, obj, "base/theme/fileman",
// "e/fileman/list/variable");
ic->sd->tmp.obj = obj;
}
_e_fm2_icon_label_set(ic, obj);
@ -2494,24 +2507,24 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
evas_object_stack_below(ic->obj, ic->sd->drop);
if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST)
{
if (ic->sd->config->icon.fixed.w)
{
// if (ic->sd->config->icon.fixed.w)
// {
if (ic->odd)
_e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list_odd/fixed");
else
_e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list/fixed");
}
else
{
if (ic->odd)
_e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list_odd/variable");
else
_e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
"e/fileman/list/variable");
}
// }
// else
// {
// if (ic->odd)
// _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
// "e/fileman/list_odd/variable");
// else
// _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets",
// "e/fileman/list/variable");
// }
}
else
{
@ -3340,7 +3353,7 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
if (strcmp(type, "text/uri-list")) return;
ev = (E_Event_Dnd_Move *)event;
printf("DND MOVE %i %i\n", ev->x, ev->y);
for (l = sd->icons; l; l = l->next)
for (l = sd->icons; l; l = l->next) /* FIXME: should only walk regions and skip non-visible ones */
{
ic = l->data;
if (E_INSIDE(ev->x, ev->y, ic->x - ic->sd->pos.x, ic->y - ic->sd->pos.y, ic->w, ic->h))
@ -3352,7 +3365,6 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
{
/* if there is a .order file - we can re-order files */
if (ic->sd->order_file)
// if (1)
{
/* if dir: */
if ((S_ISDIR(ic->info.statinfo.st_mode)) &&
@ -3398,7 +3410,12 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
}
else
{
/* FIXME: icon view mode */
/* if it's over a dir - hilight as it will be dropped in */
if ((S_ISDIR(ic->info.statinfo.st_mode)) &&
(!ic->sd->config->view.no_subdir_drop))
_e_fm2_dnd_drop_show(ic, -1);
else
_e_fm2_dnd_drop_hide(sd->obj);
}
return;
}
@ -3428,7 +3445,7 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
}
else
{
/* FIXME: icon view mode */
_e_fm2_dnd_drop_all_show(sd->obj);
}
return;
}
@ -3575,6 +3592,20 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
}
}
}
else
{
for (ll = fsel; ll; ll = ll->next)
{
fp = _e_fm2_icon_desktop_url_eval(ll->data);
if (!fp) continue;
/* move the file into the subdir */
snprintf(buf, sizeof(buf), "%s/%s",
sd->realpath, ecore_file_get_file(fp));
printf("mv %s %s\n", (char *)fp, buf);
_e_fm2_client_file_move(sd->id, fp, buf, "", 0, ev->x, ev->y);
evas_stringshare_del(fp);
}
}
}
}
_e_fm2_dnd_drop_hide(sd->obj);
@ -3944,7 +3975,7 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info)
e_icon_size_get(obj, &w, &h);
have_alpha = e_icon_alpha_get(obj);
if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST)
// if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST)
{
edje_extern_object_aspect_set(obj,
EDJE_ASPECT_CONTROL_BOTH, w, h);

24
src/bin/e_fwin.c
View File

@ -112,15 +112,24 @@ e_fwin_new(E_Container *con, const char *dev, const char *path)
o = e_fm2_add(e_win_evas_get(fwin->win));
fwin->fm_obj = o;
memset(&fmc, 0, sizeof(E_Fm2_Config));
#if 1
fmc.view.mode = E_FM2_VIEW_MODE_LIST;
fmc.view.open_dirs_in_place = 0;
fmc.view.selector = 0;
fmc.view.single_click = 0;
fmc.view.no_subdir_jump = 0;
fmc.icon.list.w = 24;
fmc.icon.list.h = 24;
fmc.icon.fixed.w = 1;
fmc.icon.fixed.h = 1;
#else
fmc.view.mode = E_FM2_VIEW_MODE_ICONS;
fmc.icon.icon.w = 48;
fmc.icon.icon.h = 48;
fmc.icon.fixed.w = 0;
fmc.icon.fixed.h = 0;
#endif
fmc.view.open_dirs_in_place = 0;
fmc.view.selector = 0;
fmc.view.single_click = 0;
fmc.view.no_subdir_jump = 0;
fmc.icon.extension.show = 1;
fmc.list.sort.no_case = 1;
fmc.list.sort.dirs.first = 1;
@ -952,6 +961,8 @@ _e_fwin_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
// printf("PAN %p -> %i %i\n", fwin, x, y);
if (x > fwin->fm_pan.max_x) x = fwin->fm_pan.max_x;
if (y > fwin->fm_pan.max_y) y = fwin->fm_pan.max_y;
if (x < 0) x = 0;
if (y < 0) y = 0;
fwin->fm_pan.x = x;
fwin->fm_pan.y = y;
_e_fwin_pan_scroll_update(fwin);
@ -1016,7 +1027,10 @@ _e_fwin_pan_scroll_update(E_Fwin *fwin)
msg->val[3] = fwin->fm_pan.max_y;
msg->val[4] = fwin->fm_pan.w;
msg->val[5] = fwin->fm_pan.h;
// printf("SEND MSG\n");
// printf("SEND MSG %i %i | %i %i | %ix%i\n",
// fwin->fm_pan.x, fwin->fm_pan.y,
// fwin->fm_pan.max_x, fwin->fm_pan.max_y,
// fwin->fm_pan.w, fwin->fm_pan.h);
if (fwin->under_obj)
edje_object_message_send(fwin->under_obj, EDJE_MESSAGE_INT_SET, 1, msg);
if (fwin->over_obj)