'everyshizzle' update:

- new thumb view: use + for zoom
- moved plugins to subdirs
- theme tweaks
- fix fuzzy match once again
- hash border and app items


SVN revision: 41961
This commit is contained in:
Hannes Janetzek 2009-08-25 04:23:11 +00:00
parent 6051d5f3a6
commit 09a4d35a07
25 changed files with 2029 additions and 532 deletions

View File

@ -560,6 +560,9 @@ src/modules/illume2/module.desktop
src/modules/syscon/Makefile
src/modules/syscon/module.desktop
src/modules/everything/Makefile
src/modules/everything/sources/Makefile
src/modules/everything/actions/Makefile
src/modules/everything/views/Makefile
src/modules/everything/module.desktop
src/modules/everything/everything.pc
src/modules/systray/Makefile

View File

@ -26581,7 +26581,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
/////////////////////////////////////////////////////////////////////////////
/*** MOD: EVERYTHING ***/
/* #define DROP_SHADOW 1 */
#define DROP_SHADOW 1
ICON("everything-launch","icon_advanced.png",64)
@ -26614,8 +26614,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
border: 50 50 50 50;
}
fill.smooth: 0;
color: 255 255 255 100;
color: 255 255 255 200;
}
}
part { name: "bg";
@ -26630,7 +26629,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
border: 7 7 5 5;
}
color: 255 255 255 255;
}
description { state: "wide" 0;
inherit: "default" 0.0;
@ -26650,7 +26648,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
border: 7 7 5 5;
}
color: 255 255 255 255;
}
description { state: "wide" 0;
inherit: "default" 0.0;
@ -26729,7 +26726,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
visible: 1;
}
}
part { name: "over1";
mouse_events: 0;
description { state: "default" 0.0;
@ -26749,7 +26745,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
rel1.to: "bg";
rel2.to: "bg";
rel2.offset: -1 40;
image {
normal: "bt_shine.png";
border: 7 7 7 0;
@ -26779,7 +26774,8 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
group { name: "e/modules/everything/selector_item";
images {
image: "gadman_border.png" COMP;
image: "everything_border.png" COMP;
image: "everything_item_bg.png" COMP;
}
parts {
part { name: "clip";
@ -26789,14 +26785,30 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
state: "default" 0.0;
}
}
part { name: "border";
part { name: "border_bg";
clip_to: "clip";
mouse_events: 0;
description { state: "default" 0.0;
color: 255 255 255 32;
rel1.offset: 2 2;
rel2.offset: -3 -3;
image {
normal: "gadman_border.png";
normal: "everything_item_bg.png";
border: 5 5 5 5;
}
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
color: 255 255 255 64;
}
}
part { name: "border";
clip_to: "clip";
mouse_events: 0;
description { state: "default" 0.0;
color: 255 255 255 64;
image {
normal: "everything_border.png";
border: 10 10 10 10;
}
}
@ -26805,7 +26817,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
color: 255 255 255 128;
}
}
part { name: "inner_clip";
type: RECT;
clip_to: "clip";
@ -26815,7 +26826,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
rel2.offset: -11 -11;
}
}
part { name: "icon_clip";
type: RECT;
clip_to: "inner_clip";
@ -26828,7 +26838,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
color: 255 255 255 200;
}
}
part {
name: "e.swallow.icons";
type: SWALLOW;
@ -26907,6 +26916,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
action: STATE_SET "selected" 0.0;
transition: SINUSOIDAL 0.2;
target: "border";
target: "border_bg";
}
program { name: "unsel";
signal: "e,state,unselected";
@ -26914,6 +26924,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.3;
target: "border";
target: "border_bg";
}
program { name: "update";
signal: "e,signal,update";
@ -26943,17 +26954,15 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
image: "drop.png" COMP;
#endif
}
/* offset to main popup */
#ifdef DROP_SHADOW
data.item: "offset_y" "-52";
min: 450 285;
min: 480 315;
#else
data.item: "offset_y" "-2";
min: 350 235;
min: 380 265;
#endif
data.item: "shaped" "1";
parts {
#ifdef DROP_SHADOW
part { name: "shadow";
@ -27051,13 +27060,11 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
rel2.offset: -1 24;
}
}
part { name: "bg";
description { state: "default" 0.0;
rel1.to_x: "base";
rel1.to_y: "input_base";
rel2.to: "base";
image {
normal: "base_bg.png";
border: 2 2 2 2;
@ -27066,7 +27073,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
color: 205 205 205 255;
}
}
part { name: "bar_base";
type: RECT;
description { state: "default" 0.0;
@ -27128,7 +27134,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
state: "default" 0.0;
rel1.to: "bar_clip";
rel1.offset: -1 0;
rel2.to: "bar_clip";
rel2.offset: -1 -1;
}
@ -27162,8 +27167,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
color: 255 255 255 128;
}
}
part { name: "input_bg";
clip_to: "input_base";
description { state: "default" 0.0;
@ -27250,7 +27253,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
visible: 1;
}
}
part { name: "list_clip";
type: RECT;
clip_to: "base";
@ -27258,12 +27260,12 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
color: 255 255 255 255;
rel1 {
relative: 0.0 0.0;
offset: 2 2;
offset: 2 0;
to: "base";
}
rel2 {
relative: 1.0 0.0;
offset: -3 -2;
offset: -3 0;
to_y: "bar_base";
to_x: "base";
}
@ -27322,8 +27324,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
middle: 0;
}
fill.smooth : 0;
color: 200 200 200 255;
color: 200 200 200 255;
}
}
part { name: "list_over2";
@ -27343,8 +27344,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
middle: 0;
}
fill.smooth : 0;
color: 200 200 200 255;
color: 200 200 200 255;
}
}
part { name: "box";
@ -27362,7 +27362,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
}
fill.smooth : 1;
color: 255 255 255 250;
}
}
}
@ -27422,7 +27421,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
}
}
}
group { name: "e/modules/everything/tab_item";
images {
@ -27430,7 +27428,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
}
min: 70 10;
max: 100 10;
parts {
part { name: "label2";
type: TEXT;
@ -27523,7 +27520,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
image: "bt_dis_hilight.png" COMP;
}
min: 140 28;
parts {
part { name: "list_bg";
type: RECT;
@ -27650,7 +27646,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
relative: 1.0 1.0;
offset: -3 -2;
}
color: 255 255 255 255;
}
}
@ -27765,6 +27760,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
}
rel2 {
relative: 1.0 1.0;
offset: -1 -4;
}
}
}
@ -27817,8 +27813,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
rel1.relative: 0.6666 0.0;
rel2.relative: 0.9999 1.0;
}
}
}
part { name: "e.swallow.icon3";
type: SWALLOW;
description { state: "default" 0.0;
@ -27877,3 +27872,622 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
/////////////////////////////////////////////////////////////////////////////
/*** WALLPAPER MAIN DIALOG ***/
group { name: "e/modules/everything/thumbview/main/window";
images {
image: "vgrad_dark.png" COMP;
image: "dia_topshad.png" COMP;
image: "dia_botshad.png" COMP;
image: "dia_botshad.png" COMP;
image: "topsh.png" COMP;
image: "wp-bot1.png" COMP;
image: "wp-bot2.png" COMP;
image: "wp-tb1.png" COMP;
image: "wp-tb2.png" COMP;
image: "wp-tb3.png" COMP;
image: "wp-tbs.png" COMP;
image: "big_arrow_up.png" COMP;
image: "busy-1.png" COMP;
image: "busy-2.png" COMP;
image: "busy-3.png" COMP;
image: "busy-4.png" COMP;
image: "busy-5.png" COMP;
image: "busy-6.png" COMP;
image: "busy-7.png" COMP;
image: "busy-8.png" COMP;
image: "busy-9.png" COMP;
}
parts {
part { name: "base";
mouse_events: 0;
description { state: "default" 0.0;
color_class: "dialog_base";
image.normal: "vgrad_dark.png";
rel1 {
relative: 0.0 0.0;
offset: 0 -3;
}
rel2 {
relative: 1.0 1.0;
offset: -1 6;
/* to_y: "bot1"; */
}
fill {
smooth: 0;
/* size {
* relative: 0.0 1.0;
* offset: 64 0;
* } */
}
}
}
part { name: "e.swallow.preview";
type: SWALLOW;
description { state: "default" 0.0;
}
}
part { name: "events";
type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
part { name: "e.swallow.list";
type: SWALLOW;
description { state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
offset: 6 1;
}
rel2 {
relative: 1.0 1.0;
offset: -3 -3;
/* to_y: "bot1"; */
}
}
}
part { name: "cover";
type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
}
description { state: "out" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part { name: "shadow2";
mouse_events: 0;
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
rel1.offset: 0 -4;
image.normal: "dia_botshad.png";
fill {
smooth: 0;
size {
relative: 0.0 1.0;
offset: 64 0;
}
}
}
}
part { name: "busy_clip";
type: RECT;
description { state: "default" 0.0;
visible: 0;
color: 255 255 255 0;
}
description { state: "visible" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
part { name: "busy";
mouse_events: 0;
clip_to: "busy_clip";
description { state: "default" 0.0;
min: 32 32;
max: 32 32;
aspect: 1.0 1.0;
aspect_preference: BOTH;
rel1 {
relative: 0.5 0.5;
offset: 0 0;
}
rel2 {
relative: 0.5 0.5;
offset: -1 1;
}
image {
normal: "busy-9.png";
tween: "busy-1.png";
tween: "busy-2.png";
tween: "busy-3.png";
tween: "busy-4.png";
tween: "busy-5.png";
tween: "busy-6.png";
tween: "busy-7.png";
tween: "busy-8.png";
}
}
}
}
programs {
program { name: "busy1";
signal: "e,state,busy,on";
source: "e";
action: STATE_SET "visible" 0.0;
transition: LINEAR 1.0;
target: "busy_clip";
}
program { name: "busy_anim";
signal: "e,state,busy,on";
source: "e";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3333;
target: "busy";
after: "busy_anim";
}
program { name: "busy2";
signal: "e,state,busy,off";
source: "e";
action: STATE_SET "default" 0.0;
transition: LINEAR 1.0;
target: "busy_clip";
after: "busy3";
}
program { name: "busy3";
action: ACTION_STOP;
target: "busy_anim";
}
}
}
group { name: "e/modules/everything/thumbview/main/mini";
images {
image: "e17_mini_button_shadow2.png" COMP;
image: "everything_item_bg.png" COMP;
}
parts {
part { name: "bg";
mouse_events: 0;
description { state: "default" 0.0;
/* visible: 0; */
rel1 {
to: "base";
offset: -1 -3;
}
rel2 {
to: "base";
offset: 0 2;
}
fill.smooth: 0;
image {
normal: "everything_item_bg.png";
border: 5 5 5 5;
}
color: 255 255 255 32;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
color: 255 255 255 128;
}
}
part { name: "base";
mouse_events: 0;
type: RECT;
description { state: "default" 0.0;
visible: 0;
rel1 {
relative: 0.0 0.0;
offset: 0 4;
}
rel2 {
relative: 1.0 1.0;
offset: -5 -5;
}
color: 255 255 255 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
part { name: "e.swallow.content";
clip_to: "base";
type: SWALLOW;
description { state: "default" 0.0;
rel1 {
to: "base";
relative: 0.0 0.0;
offset: 2 0;
}
rel2 {
to: "base";
relative: 1.0 1.0;
offset: -3 -11;
}
}
}
part { name: "e.swallow.icon";
clip_to: "base";
type: SWALLOW;
description { state: "default" 0.0;
rel1 {
to: "base";
relative: 0.0 0.0;
offset: 5 3;
}
rel2 {
to: "base";
relative: 1.0 1.0;
offset: -6 -13;
}
}
}
part { name: "e.text.label";
type: TEXT;
clip_to: "base";
effect: SOFT_SHADOW;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
rel1 {
offset: 2 -12;
relative: 0.0 1.0;
}
rel2.offset: -2 -4;
color: 210 210 210 255;
color3: 0 0 0 0;
text {
font: "Sans";
size: 10;
min: 0 1;
align: 0.5 0.0;
}
}
}
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 {
program { name: "sel";
signal: "e,state,selected";
source: "e";
action: STATE_SET "visible" 0.0;
transition: DECELERATE 0.1;
target: "bg";
}
program { name: "unsel";
signal: "e,state,unselected";
source: "e";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.2;
target: "bg";
}
program { name: "thumb_gen";
signal: "e,action,thumb,gen";
source: "e";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.0;
target: "base";
after: "thumb_ungen";
}
program { name: "thumb_ungen";
signal: "e,action,thumb,ungen";
source: "e";
action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.15;
target: "base";
}
program { name: "thumb_show_delayed";
signal: "e,action,thumb,show_delayed";
source: "e";
action: STATE_SET "default" 0.2;
target: "base";
after: "thumb_show_delayed2";
}
program { name: "thumb_show_delayed2";
action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.6;
target: "base";
}
program { name: "thumb_show";
signal: "e,action,thumb,show";
source: "e";
action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.1;
target: "base";
}
}
}
group { name: "e/modules/everything/thumbview/main/scrollframe";
images {
image: "arrow_up.png" COMP;
image: "arrow_down.png" COMP;
image: "bt_sm_base1.png" COMP;
image: "bt_sm_base2.png" COMP;
image: "bt_sm_shine.png" COMP;
image: "bt_sm_hilight.png" COMP;
image: "sb_runnerv.png" COMP;
}
parts {
// part { name: "clipper";
// type: RECT;
// mouse_events: 0;
// description { state: "default" 0.0;
// }
// }
part { name: "e.swallow.content";
// clip_to: "clipper";
type: SWALLOW;
description { state: "default" 0.0;
rel1.offset: 0 0;
rel2 {
relative: 0.0 1.0;
offset: 2 -1;
to_x: "sb_vbar";
}
}
}
part { name: "sb_vbar";
type: RECT;
mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
min: 7 17;
align: 1.0 0.0;
rel1 {
relative: 1.0 0.0;
offset: -1 0;
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
}
}
description { state: "hidden" 0.0;
visible: 0;
max: 0 99999;
rel1 {
relative: 1.0 0.0;
offset: -1 0;
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
}
}
}
part { name: "sb_vbar_base";
type: RECT;
clip_to: "sb_vbar";
mouse_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
rel1 {
relative: 0.0 1.0;
offset: 0 -1;
to: "sb_vbar_a1";
}
rel2 {
relative: 1.0 0.0;
offset: -1 0;
to: "sb_vbar_a2";
}
}
}
part { name: "sb_vbar_runner";
clip_to: "sb_vbar";
mouse_events: 0;
description { state: "default" 0.0;
max: 3 99999;
rel1.to: "sb_vbar_base";
rel1.offset: -2 0;
rel2.to: "sb_vbar_base";
image {
normal: "sb_runnerv.png";
border: 0 0 4 4;
}
fill.smooth: 0;
}
}
part { name: "sb_vbar_p1";
type: RECT;
clip_to: "sb_vbar";
mouse_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
rel1 {
relative: 0.0 1.0;
to: "sb_vbar_a1";
}
rel2 {
relative: 1.0 0.0;
to: "e.dragable.vbar";
}
}
}
part { name: "sb_vbar_p2";
type: RECT;
clip_to: "sb_vbar";
mouse_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
rel1 {
relative: 0.0 1.0;
to: "e.dragable.vbar";
}
rel2 {
relative: 1.0 0.0;
to: "sb_vbar_a2";
}
}
}
part { name: "e.dragable.vbar";
clip_to: "sb_vbar";
mouse_events: 1;
scale: 1;
dragable {
x: 0 0 0;
y: 1 1 0;
confine: "sb_vbar_base";
}
description { state: "default" 0.0;
min: 7 17;
rel1 {
relative: 0.5 0.5;
offset: -1 0;
to: "sb_vbar_base";
}
rel2 {
relative: 0.5 0.5;
offset: -1 0;
to: "sb_vbar_base";
}
image {
normal: "bt_sm_base2.png";
border: 6 6 6 6;
}
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
image.normal: "bt_sm_base1.png";
}
}
part { name: "sb_vbar_over1";
clip_to: "sb_vbar";
mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "e.dragable.vbar";
rel2.relative: 1.0 0.5;
rel2.to: "e.dragable.vbar";
image {
normal: "bt_sm_hilight.png";
border: 6 6 6 0;
}
}
}
part { name: "sb_vbar_over2";
clip_to: "sb_vbar";
mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "e.dragable.vbar";
rel2.to: "e.dragable.vbar";
image {
normal: "bt_sm_shine.png";
border: 6 6 6 0;
}
}
}
part { name: "sb_vbar_a1";
type: RECT;
clip_to: "sb_vbar";
mouse_events: 1;
description { state: "default" 0.0;
min: 7 17;
align: 0.5 0.0;
/* aspect: 1.0 1.0; */
aspect_preference: HORIZONTAL;
color: 0 0 0 0;
rel1 { to: "sb_vbar";
relative: 0.0 0.0;
offset: 0 0;
}
rel2 { to: "sb_vbar";
relative: 1.0 0.0;
offset: -1 0;
}
}
}
part { name: "sb_vbar_a2";
type: RECT;
clip_to: "sb_vbar";
mouse_events: 1;
description { state: "default" 0.0;
min: 7 17;
align: 0.5 1.0;
/* aspect: 1.0 1.0; */
aspect_preference: HORIZONTAL;
color: 0 0 0 0;
rel1 {
to: "sb_vbar";
relative: 0.0 1.0;
offset: 0 0;
}
rel2 {
to: "sb_vbar";
relative: 1.0 1.0;
offset: -1 0;
}
}
}
}
programs {
program { name: "sb_vbar_show";
signal: "e,action,show,vbar";
source: "e";
action: STATE_SET "default" 0.0;
target: "sb_vbar";
}
program { name: "sb_vbar_hide";
signal: "e,action,hide,vbar";
source: "e";
action: STATE_SET "hidden" 0.0;
target: "sb_vbar";
}
program { name: "sb_vbar_a1_down2";
signal: "mouse,down,1";
source: "sb_vbar_a1";
action: DRAG_VAL_STEP 0.0 -1.0;
target: "e.dragable.vbar";
}
program { name: "sb_vbar_a2_down2";
signal: "mouse,down,1";
source: "sb_vbar_a2";
action: DRAG_VAL_STEP 0.0 1.0;
target: "e.dragable.vbar";
}
program { name: "sb_vbar_p1_down";
signal: "mouse,down,1";
source: "sb_vbar_p1";
action: DRAG_VAL_PAGE 0.0 -1.0;
target: "e.dragable.vbar";
}
program { name: "sb_vbar_p2_down";
signal: "mouse,down,1";
source: "sb_vbar_p2";
action: DRAG_VAL_PAGE 0.0 1.0;
target: "e.dragable.vbar";
}
program { name: "sb_vbar_down";
signal: "mouse,down,1";
source: "e.dragable.vbar";
action: STATE_SET "clicked" 0.0;
target: "e.dragable.vbar";
}
program { name: "sb_vbar_up";
signal: "mouse,up,1";
source: "e.dragable.vbar";
action: STATE_SET "default" 0.0;
target: "e.dragable.vbar";
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 745 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 B

View File

@ -1,6 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in everything.pc
MODULE = everything
SUBDIRS = sources actions views
# data files for the module
filesdir = $(libdir)/enlightenment/modules/$(MODULE)
files_DATA = \
@ -29,7 +31,8 @@ module_la_SOURCES = $(EVRYHEADERS) \
evry.c \
evry_config.c \
evry_plug_aggregator.c \
evry_plug_actions.c
evry_plug_actions.c \
evry_view_plugin_tabs.c
module_la_LIBADD = @e_libs@ @dlopen_libs@
@ -42,99 +45,6 @@ installed_headers_DATA = $(EVRYHEADERS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = everything.pc
plugindir = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
evry_plug_appsdir = $(plugindir)
evry_plug_apps_LTLIBRARIES = evry_plug_apps.la
evry_plug_apps_la_SOURCES = evry_plug_apps.c
evry_plug_apps_la_LIBADD = @e_libs@
evry_plug_apps_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_apps_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_borderdir = $(plugindir)
evry_plug_border_LTLIBRARIES = evry_plug_border.la
evry_plug_border_la_SOURCES = evry_plug_border.c
evry_plug_border_la_LIBADD = @e_libs@
evry_plug_border_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_border_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_border_actdir = $(plugindir)
evry_plug_border_act_LTLIBRARIES = evry_plug_border_act.la
evry_plug_border_act_la_SOURCES = evry_plug_border_act.c
evry_plug_border_act_la_LIBADD = @e_libs@
evry_plug_border_act_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_border_act_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_dir_browsedir = $(plugindir)
evry_plug_dir_browse_LTLIBRARIES = evry_plug_dir_browse.la
evry_plug_dir_browse_la_SOURCES = evry_plug_dir_browse.c
evry_plug_dir_browse_la_LIBADD = @e_libs@
evry_plug_dir_browse_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_dir_browse_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_trackerdir = $(plugindir)
evry_plug_tracker_LTLIBRARIES = evry_plug_tracker.la
evry_plug_tracker_la_SOURCES = evry_plug_tracker.c
evry_plug_tracker_la_LIBADD = @e_libs@
evry_plug_tracker_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_tracker_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_calcdir = $(plugindir)
evry_plug_calc_LTLIBRARIES = evry_plug_calc.la
evry_plug_calc_la_SOURCES = evry_plug_calc.c
evry_plug_calc_la_LIBADD = @e_libs@
evry_plug_calc_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_calc_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_configdir = $(plugindir)
evry_plug_config_LTLIBRARIES = evry_plug_config.la
evry_plug_config_la_SOURCES = evry_plug_config.c
evry_plug_config_la_LIBADD = @e_libs@
evry_plug_config_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_config_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_aspelldir = $(plugindir)
evry_plug_aspell_LTLIBRARIES = evry_plug_aspell.la
evry_plug_aspell_la_SOURCES = evry_plug_aspell.c
evry_plug_aspell_la_LIBADD = @e_libs@
evry_plug_aspell_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_aspell_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_clipboarddir = $(plugindir)
evry_plug_clipboard_LTLIBRARIES = evry_plug_clipboard.la
evry_plug_clipboard_la_SOURCES = evry_plug_clipboard.c
evry_plug_clipboard_la_LIBADD = @e_libs@
evry_plug_clipboard_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_clipboard_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_previewdir = $(plugindir)
evry_plug_preview_LTLIBRARIES = evry_plug_preview.la
evry_plug_preview_la_SOURCES = evry_plug_preview.c
evry_plug_preview_la_LIBADD = @e_libs@
evry_plug_preview_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_preview_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_view_listdir = $(plugindir)
evry_plug_view_list_LTLIBRARIES = evry_plug_view_list.la
evry_plug_view_list_la_SOURCES = evry_plug_view_list.c
evry_plug_view_list_la_LIBADD = @e_libs@
evry_plug_view_list_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_view_list_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_view_helpdir = $(plugindir)
evry_plug_view_help_LTLIBRARIES = evry_plug_view_help.la
evry_plug_view_help_la_SOURCES = evry_plug_view_help.c
evry_plug_view_help_la_LIBADD = @e_libs@
evry_plug_view_help_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_view_help_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_wallpaperdir = $(plugindir)
evry_plug_wallpaper_LTLIBRARIES = evry_plug_wallpaper.la
evry_plug_wallpaper_la_SOURCES = evry_plug_wallpaper.c
evry_plug_wallpaper_la_LIBADD = @e_libs@
evry_plug_wallpaper_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_wallpaper_la_LIBTOOLFLAGS = --tag=disable-static
uninstall:
rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
rm -rf $(DESTDIR)$(libdir)/enlightenment/everything_plugins/core/

View File

@ -6,6 +6,7 @@
typedef struct _Config Config;
typedef struct _Evry_Selector Evry_Selector;
typedef struct _Tab_View Tab_View;
struct _Config
{
@ -57,8 +58,26 @@ struct _Evry_Selector
/* all plugins that belong to this selector*/
Eina_List *plugins;
Evry_View *view;
};
struct _Tab_View
{
Evas *evas;
const Evry_State *state;
Evas_Object *o_tabs;
Eina_List *tabs;
void (*update) (Tab_View *tv);
void (*clear) (Tab_View *tv);
int (*key_down) (Tab_View *tv, const Ecore_Event_Key *ev);
};
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init (E_Module *m);
@ -77,6 +96,9 @@ void evry_plug_aggregator_free(Evry_Plugin *plugin);
Evry_Plugin *evry_plug_actions_new(void);
void evry_plug_actions_free(Evry_Plugin *plugin);
Tab_View *evry_tab_view_new(const Evry_State *s, Evas *e);
void evry_tab_view_free(Tab_View *v);
extern Config *evry_conf;
extern Evry_Selector **selectors;

View File

@ -10,7 +10,7 @@
*/
#define INPUTLEN 40
#define MATCH_LAG 0.33
#define MAX_FUZZ 150
#define MAX_FUZZ 100
#define MAX_WORDS 5
@ -40,7 +40,7 @@ static void _evry_matches_update(Evry_Selector *sel);
static void _evry_plugin_action(Evry_Selector *sel, int finished);
static void _evry_plugin_select(Evry_State *s, Evry_Plugin *p);
static void _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p);
static void _evry_backspace(Evry_State *s);
static int _evry_backspace(Evry_State *s);
static void _evry_update(Evry_State *s, int fetch);
static void _evry_update_text_label(Evry_State *s);
static int _evry_clear(Evry_State *s);
@ -59,7 +59,7 @@ static int _evry_selector_subjects_get(const char *plugin_name);
static int _evry_selector_actions_get(Evry_Item *it);
static int _evry_selector_objects_get(Evry_Action *act);
static void _evry_browse_item(Evry_Selector *sel);
static int _evry_browse_item(Evry_Selector *sel);
static void _evry_browse_back(Evry_Selector *sel);
static Evry_Window *_evry_window_new(E_Zone *zone);
@ -245,7 +245,7 @@ evry_clear_input(void)
}
/* static int item_cnt = 0; */
static int item_cnt = 0;
EAPI Evry_Item *
evry_item_new(Evry_Item *base, Evry_Plugin *p, const char *label, void (*cb_free) (Evry_Item *item))
@ -267,7 +267,7 @@ evry_item_new(Evry_Item *base, Evry_Plugin *p, const char *label, void (*cb_free
it->ref = 1;
/* item_cnt++; */
item_cnt++;
return it;
}
@ -283,13 +283,10 @@ evry_item_free(Evry_Item *it)
/* printf("%d, %d\t free: %s\n",
* it->ref, item_cnt - 1,
* it->label);
* item_cnt--; */
* it->label); */
item_cnt--;
if (it->label) eina_stringshare_del(it->label);
/* if (it->uri) eina_stringshare_del(it->uri);
* if (it->mime) eina_stringshare_del(it->mime); */
if (it->o_bg) evas_object_del(it->o_bg);
if (it->o_icon) evas_object_del(it->o_icon);
@ -423,7 +420,8 @@ evry_fuzzy_match(const char *str, const char *match)
unsigned int m_num = 0;
unsigned int m_cnt = 0;
unsigned int m_min[MAX_WORDS];
unsigned int m_len = 0;
if (!match || !str) return 0;
/* remove white spaces at the beginning */
@ -440,6 +438,11 @@ evry_fuzzy_match(const char *str, const char *match)
for (m = match; ip && (*m != 0); m++)
if (ip && ispunct(*m)) ip = 0;
m_len = strlen(match);
/* with less than 3 chars match must be a prefix */
if (m_len < 3) m_len = 0;
next = str;
m = match;
@ -489,11 +492,11 @@ evry_fuzzy_match(const char *str, const char *match)
else
offset += 3;
if (offset < 10)
if (offset <= m_len * 3)
continue;
}
if (min < MAX_FUZZ && offset < 10)
if (min < MAX_FUZZ && offset <= m_len * 3)
{
/* first offset of match in word */
if (!first)
@ -1087,24 +1090,25 @@ _evry_state_pop(Evry_Selector *sel)
sel->state = NULL;
}
static void
static int
_evry_browse_item(Evry_Selector *sel)
{
Evry_State *s = sel->state;
Evry_Item *it;
Eina_List *l, *plugins = NULL;
Evry_Plugin *p, *plugin;
Evry_View *view = NULL;
const char *type_out;
it = s->sel_item;
if (!it || !it->browseable)
return;
return 0;
type_out = it->plugin->type_out;
if (!type_out)
return;
return 1;
if (it->plugin->begin &&
(p = it->plugin->begin(it->plugin, it)))
@ -1126,13 +1130,32 @@ _evry_browse_item(Evry_Selector *sel)
}
}
if (!plugins) return;
_evry_view_hide(s->view);
if (!plugins) return 1;
if (s->view)
{
_evry_view_hide(s->view);
view = s->view->id;
}
_evry_state_new(sel, plugins);
_evry_matches_update(sel);
_evry_selector_update(sel);
_evry_list_win_update(sel->state);
s = sel->state;
if (view && list->visible && s)
{
s->view = view->create(view, s, list->o_main);
if (s->view)
{
_evry_view_show(s->view);
s->view->update(s->view);
}
}
_evry_update_text_label(sel->state);
return 1;
}
static void
@ -1281,15 +1304,18 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
_evry_plugin_action(selector, 0);
else
else if (!_evry_browse_item(selector))
_evry_plugin_action(selector, 1);
}
else if (!strcmp(key, "Escape"))
else if (!strcmp(key, "Escape"))
evry_hide();
else if (!strcmp(key, "Tab"))
_evry_selectors_switch();
else if (!strcmp(key, "BackSpace"))
_evry_backspace(s);
{
if (!_evry_backspace(s))
_evry_browse_back(selector);
}
else if (!strcmp(key, "Delete"))
_evry_backspace(s);
else if (_evry_view_key_press(s, ev))
@ -1319,7 +1345,7 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
return 1;
}
static void
static int
_evry_backspace(Evry_State *s)
{
int len, val, pos;
@ -1336,8 +1362,12 @@ _evry_backspace(Evry_State *s)
if ((pos == 0) || !isspace(val))
_evry_update(s, 1);
return 1;
}
}
return 0;
}
static void

View File

@ -38,7 +38,7 @@ _cb_sort(const void *data1, const void *data2)
if (it1->priority - it2->priority)
return (it1->priority - it2->priority);
return 0;
return strcasecmp(it1->label, it2->label);
}
static int

View File

@ -0,0 +1,64 @@
MAINTAINERCLEANFILES = Makefile.in
# the module .so file
INCLUDES = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/src/modules/$(MODULE) \
-I$(top_srcdir)/src/bin \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \
@e_cflags@
plugindir = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
evry_plug_appsdir = $(plugindir)
evry_plug_apps_LTLIBRARIES = evry_plug_apps.la
evry_plug_apps_la_SOURCES = evry_plug_apps.c
evry_plug_apps_la_LIBADD = @e_libs@
evry_plug_apps_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_apps_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_borderdir = $(plugindir)
evry_plug_border_LTLIBRARIES = evry_plug_border.la
evry_plug_border_la_SOURCES = evry_plug_border.c
evry_plug_border_la_LIBADD = @e_libs@
evry_plug_border_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_border_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_dir_browsedir = $(plugindir)
evry_plug_dir_browse_LTLIBRARIES = evry_plug_dir_browse.la
evry_plug_dir_browse_la_SOURCES = evry_plug_dir_browse.c
evry_plug_dir_browse_la_LIBADD = @e_libs@
evry_plug_dir_browse_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_dir_browse_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_trackerdir = $(plugindir)
evry_plug_tracker_LTLIBRARIES = evry_plug_tracker.la
evry_plug_tracker_la_SOURCES = evry_plug_tracker.c
evry_plug_tracker_la_LIBADD = @e_libs@
evry_plug_tracker_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_tracker_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_calcdir = $(plugindir)
evry_plug_calc_LTLIBRARIES = evry_plug_calc.la
evry_plug_calc_la_SOURCES = evry_plug_calc.c
evry_plug_calc_la_LIBADD = @e_libs@
evry_plug_calc_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_calc_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_configdir = $(plugindir)
evry_plug_config_LTLIBRARIES = evry_plug_config.la
evry_plug_config_la_SOURCES = evry_plug_config.c
evry_plug_config_la_LIBADD = @e_libs@
evry_plug_config_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_config_la_LIBTOOLFLAGS = --tag=disable-static
evry_plug_aspelldir = $(plugindir)
evry_plug_aspell_LTLIBRARIES = evry_plug_aspell.la
evry_plug_aspell_la_SOURCES = evry_plug_aspell.c
evry_plug_aspell_la_LIBADD = @e_libs@
evry_plug_aspell_la_LDFLAGS = -no-undefined -module -avoid-version
evry_plug_aspell_la_LIBTOOLFLAGS = --tag=disable-static

View File

@ -20,11 +20,16 @@ static Evry_Action *act3;
static Evry_Action *act4;
static Eina_List *exe_path = NULL;
static void _hash_free(void *data)
{
ITEM_APP(app, data);
evry_item_free(EVRY_ITEM(app));
}
static Evry_Plugin *
_begin(Evry_Plugin *plugin, const Evry_Item *item)
{
/* Plugin *p = (Plugin*) plugin; */
PLUGIN(p, plugin);
const char *mime;
@ -53,6 +58,8 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item)
}
}
p->added = eina_hash_string_small_new(_hash_free);
return EVRY_PLUGIN(p);
}
@ -61,8 +68,10 @@ _item_free(Evry_Item *item)
{
ITEM_APP(app, item);
if (app->file) eina_stringshare_del(app->file);
if (app->desktop) efreet_desktop_free(app->desktop);
if (app->desktop)
efreet_desktop_free(app->desktop);
if (app->file)
eina_stringshare_del(app->file);
E_FREE(app);
}
@ -73,7 +82,9 @@ _cleanup(Evry_Plugin *plugin)
PLUGIN(p, plugin);
Efreet_Desktop *desktop;
EVRY_PLUGIN_ITEMS_FREE(p);
eina_hash_free(p->added);
EVRY_PLUGIN_ITEMS_CLEAR(p);
EINA_LIST_FREE(p->apps_mime, desktop)
efreet_desktop_free(desktop);
@ -94,6 +105,17 @@ _item_add(Plugin *p, Efreet_Desktop *desktop, char *file, int match)
if (!file) return 0;
if ((app = eina_hash_find(p->added, file)) &&
(!desktop || (desktop == app->desktop)))
{
if (!eina_list_data_find_list(EVRY_PLUGIN(p)->items, app))
{
EVRY_ITEM(app)->fuzzy_match = match;
EVRY_PLUGIN_ITEM_APPEND(p, app);
}
return 1;
}
if (!desktop)
{
char match[4096];
@ -101,9 +123,6 @@ _item_add(Plugin *p, Efreet_Desktop *desktop, char *file, int match)
int len;
char *tmp;
if (eina_hash_find(p->added, file))
return 0;
len = strlen(file);
tmp = ecore_file_app_exe_get(file);
snprintf(match, sizeof(match), "%s*", tmp);
@ -121,24 +140,14 @@ _item_add(Plugin *p, Efreet_Desktop *desktop, char *file, int match)
}
free(tmp);
if (!desktop)
eina_hash_add(p->added, file, file);
}
if (desktop)
{
if ((d2 = eina_hash_find(p->added, file)) &&
((desktop == d2) ||
(!strcmp(desktop->exec, d2->exec))))
return 0;
if (!already_refd)
efreet_desktop_ref(desktop);
eina_hash_add(p->added, file, desktop);
file = NULL;
}
app = E_NEW(Evry_Item_App, 1);
if (desktop)
@ -147,11 +156,14 @@ _item_add(Plugin *p, Efreet_Desktop *desktop, char *file, int match)
evry_item_new(EVRY_ITEM(app), EVRY_PLUGIN(p), file, _item_free);
app->desktop = desktop;
app->file = file;
app->file = eina_stringshare_add(file);
EVRY_ITEM(app)->fuzzy_match = match;
EVRY_PLUGIN_ITEM_APPEND(p, app);
eina_hash_add(p->added, file, app);
return 1;
}
@ -232,10 +244,8 @@ _fetch(Evry_Plugin *plugin, const char *input)
char *file;
int