rendered paste bodyOnly in ../werkstatt/milky: e17_button_detail_skip.png
Only in ../werkstatt/milky: e17_button_detail_skip_pager.png
Only in ../werkstatt/milky: e17_icon_fileman_hdd.png
Only in ../werkstatt/milky: milky.edj
diff -u milky/milky_border.edc ../werkstatt/milky/milky_border.edc
--- milky/milky_border.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_border.edc 2007-07-13 17:59:43.000000000 +0200
@@ -446,7 +446,26 @@
color: 0 0 0 0; \
} \
}
-
+ #define SIMPLE_RECTI(NAME, TYPE, REL1X, REL1Y, OFF1X, OFF1Y, TO1, TO1b, REL2X, REL2Y, OFF2X, OFF2Y, TO2, TO2b) \
+part { \
+ name: NAME; \
+ type: TYPE; \
+ description { \
+ state: "default" 0.0; \
+ rel1 { \
+ relative: REL1X REL1Y; \
+ offset: OFF1X OFF1Y; \
+ to_x: TO1; \
+ to_y: TO1b; \
+ } \
+ rel2 { \
+ relative: REL2X REL2Y; \
+ offset: OFF2X OFF2Y; \
+ to_x: TO2; \
+ to_y: TO2b; \
+ } \
+ } \
+ }
images {
image: "e17_border1.png" COMP;
image: "e17_border2.png" COMP;
@@ -476,6 +495,8 @@
image: "e17_button_detail_locks_application.png" COMP;
image: "e17_button_detail_borderless.png" COMP;
image: "e17_button_detail_remember.png" COMP;
+ image: "e17_button_detail_skip.png" COMP;
+ image: "e17_button_detail_skip_pager.png" COMP;
image: "e17_button_detail_skip_winlist.png" COMP;
image: "e17_button_detail_fullscreen.png" COMP;
image: "e17_button_detail_sendto.png" COMP;
@@ -1121,7 +1142,7 @@
color: 255 255 255 255;
}
}
- SIMPLE_RECT("e.swallow.icon", SWALLOW, 0.0, 0.0, 33, 1, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
+ SIMPLE_RECTI("e.swallow.icon", SWALLOW, 0.0, 0.0, 33, 1, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
SIMPLE_RECT("right", RECT, 1.0, 0.0, -55, 0, "whole", "whole", 1.0, 1.0, 0, 0, "whole", "t1")
SIMPLE_RECT("left", RECT, 0.0, 0.0, 0, 0, "whole", "whole", 0.0, 1.0, 55, 0, "whole", "t1")
SIMPLE_RECT("e.event.resize.l", RECT, 0.0, 1.0, 0, 0, "whole", "t1", 0.0, 1.0, 3, -1, "whole", "whole")
@@ -2160,7 +2181,7 @@
color: 255 255 255 255;
}
}
- SIMPLE_RECT("e.swallow.icon", SWALLOW, 0.0, 0.0, 33, 1, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
+ SIMPLE_RECTI("e.swallow.icon", SWALLOW, 0.0, 0.0, 33, 1, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
SIMPLE_RECT("right", RECT, 1.0, 0.0, -55, 0, "whole", "whole", 1.0, 1.0, 0, 0, "whole", "t1")
SIMPLE_RECT("left", RECT, 0.0, 0.0, 0, 0, "whole", "whole", 0.0, 1.0, 55, 0, "whole", "t1")
SIMPLE_RECT("e.event.resize.l", RECT, 0.0, 1.0, 0, 0, "whole", "t1", 0.0, 1.0, 3, -1, "whole", "whole")
@@ -3232,7 +3253,6 @@
offset: -33 -2;
to: "left";
}
- color: 0 0 0 0;
}
}
@@ -4193,7 +4213,7 @@
color: 255 255 255 255;
}
}
- SIMPLE_RECT("e.swallow.icon", SWALLOW, 0.0, 0.0, 33, 1, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
+ SIMPLE_RECTI("e.swallow.icon", SWALLOW, 0.0, 0.0, 33, 1, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
SIMPLE_RECT("right", RECT, 1.0, 0.0, -55, 0, "whole", "whole", 1.0, 1.0, 0, 0, "whole", "t1")
SIMPLE_RECT("left", RECT, 0.0, 0.0, 0, 0, "whole", "whole", 0.0, 1.0, 55, 0, "whole", "t1")
@@ -5250,7 +5270,7 @@
}
}
- SIMPLE_RECT("e.swallow.icon", SWALLOW, 0.0, 0.0, 1, 0, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
+ SIMPLE_RECTI("e.swallow.icon", SWALLOW, 0.0, 0.0, 1, 0, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
SIMPLE_RECT("right", RECT, 1.0, 0.0, -23, 0, "whole", "whole", 1.0, 1.0, 0, 0, "whole", "t1")
SIMPLE_RECT("left", RECT, 0.0, 0.0, 0, 0, "whole", "whole", 0.0, 1.0, 23, 0, "whole", "t1")
@@ -6221,7 +6241,7 @@
color: 255 255 255 255;
}
}
- SIMPLE_RECT("e.swallow.icon", SWALLOW, 0.0, 0.0, 1, 0, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
+ SIMPLE_RECTI("e.swallow.icon", SWALLOW, 0.0, 0.0, 1, 0, "right", "right", 1.0, 1.0, -8, -2, "right", "right")
SIMPLE_RECT("right", RECT, 1.0, 0.0, -23, 0, "whole", "whole", 1.0, 1.0, 0, 0, "whole", "t1")
SIMPLE_RECT("left", RECT, 0.0, 0.0, 0, 0, "whole", "whole", 0.0, 1.0, 23, 0, "whole", "t1")
@@ -6594,3 +6614,5 @@
FULL_SIZE_BORDER_BUTTON("stack_normal")
FULL_SIZE_BORDER_BUTTON("stack_below")
FULL_SIZE_BORDER_BUTTON("properties")
+FULL_SIZE_BORDER_BUTTON("skip")
+FULL_SIZE_BORDER_BUTTON("skip_pager")
Only in ../werkstatt/milky: milky_border.edc.orig
diff -u milky/milky_button.edc ../werkstatt/milky/milky_button.edc
--- milky/milky_button.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_button.edc 2007-07-13 17:40:16.000000000 +0200
@@ -66,7 +66,6 @@
description {
state: "default" 0.0;
align: 0.0 0.5;
- color: 0 0 0 0;
rel1 {
relative: 0.0 0.0;
offset: 4 8;
@@ -84,7 +83,6 @@
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
align: 0.0 0.5;
- color: 0 0 0 0;
rel1 {
relative: 0.0 0.0;
offset: 8 8;
diff -u milky/milky_color_well.edc ../werkstatt/milky/milky_color_well.edc
--- milky/milky_color_well.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_color_well.edc 2007-07-13 17:41:32.000000000 +0200
@@ -55,7 +55,6 @@
rel2 {
offset: -5 -5;
}
- color: 0 0 0 0;
}
}
part {
diff -u milky/milky_configure.edc ../werkstatt/milky/milky_configure.edc
--- milky/milky_configure.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_configure.edc 2007-07-13 17:41:48.000000000 +0200
@@ -112,7 +112,6 @@
description {
state: "default" 0.0;
align: 0.5 0.5;
- color: 0 0 0 0;
min: 320 200;
rel1 {
to_y: "logo";
@@ -130,7 +129,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
align: 0.5 1.0;
fixed: 0 1;
rel1 {
Only in ../werkstatt/milky: milky_configure.edc.orig
diff -u milky/milky_cslider.edc ../werkstatt/milky/milky_cslider.edc
--- milky/milky_cslider.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_cslider.edc 2007-07-13 17:42:06.000000000 +0200
@@ -56,7 +56,6 @@
rel2 {
offset: -5 -5;
}
- color: 0 0 0 0;
}
}
part {
diff -u milky/milky_deskpreview.edc ../werkstatt/milky/milky_deskpreview.edc
--- milky/milky_deskpreview.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_deskpreview.edc 2007-07-13 17:42:20.000000000 +0200
@@ -50,7 +50,6 @@
rel2 {
offset: -3 -3;
}
- color: 0 0 0 0;
}
}
part {
diff -u milky/milky_dialog.edc ../werkstatt/milky/milky_dialog.edc
--- milky/milky_dialog.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_dialog.edc 2007-07-13 17:42:32.000000000 +0200
@@ -63,7 +63,6 @@
description {
state: "default" 0.0;
align: 0.0 0.5;
- color: 0 0 0 0;
fixed: 1 0;
rel1 {
relative: 0.0 0.0;
@@ -81,7 +80,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
rel1 {
relative: 1.0 0.0;
offset: 8 16;
@@ -122,7 +120,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
align: 0.5 1.0;
fixed: 0 1;
rel1 {
Only in ../werkstatt/milky: milky_dialog.edc.orig
diff -u milky/milky_exebuf.edc ../werkstatt/milky/milky_exebuf.edc
--- milky/milky_exebuf.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_exebuf.edc 2007-07-13 17:42:47.000000000 +0200
@@ -86,7 +86,6 @@
clip_to: "eap_list_clip";
description {
state: "default" 0.0;
- color: 0 0 0 0;
min: 32 64;
align: 0.5 0.0;
rel1 {
@@ -182,7 +181,6 @@
clip_to: "exe_list_clip";
description {
state: "default" 0.0;
- color: 0 0 0 0;
min: 32 64;
align: 0.5 1.0;
rel1 {
@@ -341,7 +339,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
aspect: 1.0 1.0;
align: 0.0 0.5;
aspect_preference: VERTICAL;
@@ -883,7 +880,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
aspect: 1.0 1.0;
align: 0.0 0.5;
aspect_preference: VERTICAL;
Only in ../werkstatt/milky: milky_exebuf.edc.orig
diff -u milky/milky_fileman.edc ../werkstatt/milky/milky_fileman.edc
--- milky/milky_fileman.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_fileman.edc 2007-07-13 17:43:30.000000000 +0200
@@ -83,7 +83,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
rel2 {
relative: 0.0 0.0;
offset: -1 -1;
@@ -6054,7 +6053,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
rel2 {
relative: 0.0 0.0;
offset: -1 -1;
@@ -9206,6 +9204,7 @@
image: "e17_icon_fileman_home.png" COMP;
image: "e17_icon_fileman_desktop.png" COMP;
image: "e17_icon_fileman_hd.png" COMP;
+ image: "e17_icon_fileman_hdd.png" COMP;
image: "e17_icon_fileman_pdf.png" COMP;
image: "e17_icon_fileman_c.png" COMP;
Only in ../werkstatt/milky: milky_fileman.edc.orig
Only in ../werkstatt/milky: milky_fileman.edc.rej
diff -u milky/milky_filesel.edc ../werkstatt/milky/milky_filesel.edc
--- milky/milky_filesel.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_filesel.edc 2007-07-13 17:43:40.000000000 +0200
@@ -56,7 +56,6 @@
rel2 {
offset: -13 -5;
}
- color: 0 0 0 0;
}
description {
state: "top" 0.0;
@@ -86,7 +85,6 @@
relative: 1.0 1.0;
offset: -13 -5;
}
- color: 0 0 0 255;
}
}
part {
diff -u milky/milky_frame.edc ../werkstatt/milky/milky_frame.edc
--- milky/milky_frame.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_frame.edc 2007-07-13 17:43:48.000000000 +0200
@@ -22,7 +22,6 @@
relative: 1.0 1.0;
offset: -4 -4;
}
- color: 0 0 0 0;
}
}
part {
diff -u milky/milky_ibar.edc ../werkstatt/milky/milky_ibar.edc
--- milky/milky_ibar.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_ibar.edc 2007-07-13 17:43:56.000000000 +0200
@@ -40,7 +40,6 @@
relative: 1.0 1.0;
offset: -3 -3;
}
- color: 0 0 0 0;
}
description {
state: "bigger" 0.0;
@@ -189,7 +188,6 @@
rel2 {
to: "background";
}
- color: 0 0 0 0;
}
}
part {
diff -u milky/milky_ibox.edc ../werkstatt/milky/milky_ibox.edc
--- milky/milky_ibox.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_ibox.edc 2007-07-13 17:44:09.000000000 +0200
@@ -40,7 +40,6 @@
relative: 1.0 1.0;
offset: -3 -3;
}
- color: 0 0 0 0;
}
description {
state: "bigger" 0.0;
@@ -192,7 +191,6 @@
rel2 {
to: "background";
}
- color: 0 0 0 0;
}
}
part {
diff -u milky/milky_menu.edc ../werkstatt/milky/milky_menu.edc
--- milky/milky_menu.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_menu.edc 2007-07-13 17:44:26.000000000 +0200
@@ -144,7 +144,6 @@
relative: 1.0 1.0;
offset: -2 -2;
}
- color: 0 0 0 0;
}
}
}
Only in ../werkstatt/milky: milky_menu.edc.orig
diff -u milky/milky_pager.edc ../werkstatt/milky/milky_pager.edc
--- milky/milky_pager.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_pager.edc 2007-07-13 17:44:36.000000000 +0200
@@ -203,7 +203,6 @@
to: "overlay";
offset: -5 -5;
}
- color: 0 0 0 0;
}
}
part {
@@ -329,7 +328,6 @@
rel2 {
offset: -3 -3;
}
- color: 0 0 0 0;
}
}
part {
@@ -510,42 +508,8 @@
after: "go_active4";
after: "go_active4b";
}
- program {
- name: "handle_urgent";
- signal: "e,state,urgent";
- source: "e";
- script {
- if (get_int(active) == 0) {
- run_program(PROGRAM:"go_urgent");
- }
- }
- }
- program {
- name: "go_urgent";
- signal: "";
- source: "";
- action: STATE_SET "active" 0.0;
- target: "sel";
- transition: LINEAR 1.5;
- after: "go_urgent2";
- }
- program {
- name: "go_urgent2";
- signal: "";
- source: "";
- action: STATE_SET "default" 0.0;
- target: "sel";
- transition: LINEAR 1.5;
- after: "go_urgent";
- }
- program {
- name: "go_noturgent";
- signal: "e,state,not_urgent";
- source: "e";
- action: ACTION_STOP;
- target: "go_urgent";
- target: "go_urgent2";
- }
+
+
program {
name: "go_active4";
action: STATE_SET "active2" 0.0;
@@ -673,6 +637,17 @@
border: 6 13 7 5;
}
}
+ description {
+ state: "urgent" 0.0;
+ inherit: "default" 0.0;
+ rel1 {
+ relative: -0.5 -0.5;
+ }
+ rel2 {
+ relative: 1.5 1.5;
+ }
+ color: 255 255 255 0;
+ }
}
part {
name: "icon";
@@ -689,9 +664,40 @@
rel2 {
offset: -2 -2;
}
- color: 0 0 0 0;
}
}
}
+ programs {
+ program {
+ name: "go_urgent_pre";
+ signal: "e,state,urgent";
+ source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "overlay";
+ after: "go_urgent";
+ }
+ program {
+ name: "go_urgent";
+ action: STATE_SET "urgent" 0.0;
+ transition: LINEAR 0.5;
+ target: "overlay";
+ after: "go_urgent_pre";
+ }
+ program {
+ name: "go_unurgent";
+ signal: "e,state,not_urgent";
+ source: "e";
+ action: ACTION_STOP;
+ target: "go_urgent_pre";
+ target: "go_urgent";
+ after: "go_unurgent2";
+ }
+ program {
+ name: "go_unurgent2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.3;
+ target: "overlay";
+ }
+ }
}
Only in ../werkstatt/milky: milky_pager.edc.orig
diff -u milky/milky_preview.edc ../werkstatt/milky/milky_preview.edc
--- milky/milky_preview.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_preview.edc 2007-07-13 17:44:46.000000000 +0200
@@ -48,7 +48,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
rel1 {
offset: 2 2;
}
diff -u milky/milky_scrollframe.edc ../werkstatt/milky/milky_scrollframe.edc
--- milky/milky_scrollframe.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_scrollframe.edc 2007-07-13 17:44:59.000000000 +0200
@@ -60,7 +60,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
rel1 {
offset: 4 4;
}
diff -u milky/milky_shelf.edc ../werkstatt/milky/milky_shelf.edc
--- milky/milky_shelf.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_shelf.edc 2007-07-13 17:46:04.000000000 +0200
@@ -491,7 +491,6 @@
rel2 {
offset: -5 -5;
}
- color: 0 0 0 0;
}
}
part {
@@ -541,7 +540,6 @@
rel2 {
offset: -1 -1;
}
- color: 0 0 0 0;
}
}
}
@@ -1029,7 +1027,6 @@
rel2 {
offset: -5 -5;
}
- color: 0 0 0 0;
}
}
part {
@@ -1081,7 +1078,6 @@
rel2 {
offset: -1 -1;
}
- color: 0 0 0 0;
}
}
}
Only in ../werkstatt/milky: milky_shelf.edc.orig
Only in ../werkstatt/milky: milky_shelf.edc.rej
diff -u milky/milky_spectrum.edc ../werkstatt/milky/milky_spectrum.edc
--- milky/milky_spectrum.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_spectrum.edc 2007-07-13 17:45:18.000000000 +0200
@@ -58,7 +58,6 @@
rel2 {
offset: -5 -5;
}
- color: 0 0 0 0;
}
}
part {
diff -u milky/milky_winlist.edc ../werkstatt/milky/milky_winlist.edc
--- milky/milky_winlist.edc 2007-07-20 11:00:40.000000000 +0200
+++ ../werkstatt/milky/milky_winlist.edc 2007-07-13 17:45:28.000000000 +0200
@@ -84,7 +84,6 @@
clip_to: "list_clip";
description {
state: "default" 0.0;
- color: 0 0 0 0;
rel1 {
relative: 0.0 1.0;
offset: 16 16;
@@ -271,7 +270,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
aspect: 1.0 1.0;
align: 0.5 1.0;
min: 32 32;
@@ -714,7 +712,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
aspect: 1.0 1.0;
align: 0.0 0.5;
aspect_preference: VERTICAL;
Only in ../werkstatt/milky: milky_winlist.edc.orig