summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/themes/Makefile.am2
-rw-r--r--data/themes/default.edc2
-rw-r--r--data/themes/edc/pager.edc154
-rw-r--r--data/themes/edc/pager_plain.edc (renamed from data/themes/edc/pager16.edc)158
4 files changed, 158 insertions, 158 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2de990b..f2e3a78 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -68,7 +68,7 @@ edc/music_control.edc \
68edc/notification.edc \ 68edc/notification.edc \
69edc/packagekit.edc \ 69edc/packagekit.edc \
70edc/pager.edc \ 70edc/pager.edc \
71edc/pager16.edc \ 71edc/pager_plain.edc \
72edc/pointer.edc \ 72edc/pointer.edc \
73edc/preview.edc \ 73edc/preview.edc \
74edc/radio.edc \ 74edc/radio.edc \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 953de8b..578ceec 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -117,7 +117,7 @@ collections {
117// modules 117// modules
118#include "edc/start.edc" 118#include "edc/start.edc"
119#include "edc/pager.edc" 119#include "edc/pager.edc"
120#include "edc/pager16.edc" 120#include "edc/pager_plain.edc"
121#include "edc/xkbswitch.edc" 121#include "edc/xkbswitch.edc"
122#include "edc/tasks.edc" 122#include "edc/tasks.edc"
123#include "edc/connman.edc" 123#include "edc/connman.edc"
diff --git a/data/themes/edc/pager.edc b/data/themes/edc/pager.edc
index 4596db8..5466ab4 100644
--- a/data/themes/edc/pager.edc
+++ b/data/themes/edc/pager.edc
@@ -16,8 +16,8 @@ group { name: "e/modules/pager/popup";
16 image.border: 1 1 1 1; 16 image.border: 1 1 1 1;
17 image.middle: 0; 17 image.middle: 0;
18 fill.smooth: 0; 18 fill.smooth: 0;
19 } 19 }
20 } 20 }
21 part { name: "e.swallow.content"; type: SWALLOW; 21 part { name: "e.swallow.content"; type: SWALLOW;
22 description { state: "default" 0.0; 22 description { state: "default" 0.0;
23 rel1.to_y: "e.text.label"; 23 rel1.to_y: "e.text.label";
@@ -25,8 +25,8 @@ group { name: "e/modules/pager/popup";
25 rel1.offset: 2 0; 25 rel1.offset: 2 0;
26 rel2.relative: 1.0 1.0; 26 rel2.relative: 1.0 1.0;
27 rel2.offset: -3 -2; 27 rel2.offset: -3 -2;
28 } 28 }
29 } 29 }
30 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 30 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
31 scale: 1; 31 scale: 1;
32 effect: SHADOW BOTTOM; 32 effect: SHADOW BOTTOM;
@@ -70,34 +70,12 @@ group { name: "e/modules/pager/desk";
70 images.image: "mini_blue_glow_arrow_2.png" COMP; 70 images.image: "mini_blue_glow_arrow_2.png" COMP;
71 images.image: "mini_blue_glow_arrow_3.png" COMP; 71 images.image: "mini_blue_glow_arrow_3.png" COMP;
72 parts { 72 parts {
73 part { name: "base"; 73 part { name: "base"; type: SPACER;
74 description { state: "default" 0.0; 74 description { state: "default" 0.0;
75 image.normal: "vgrad_med_darker.png";
76 rel1.to: "inset"; 75 rel1.to: "inset";
77 rel1.offset: 1 1; 76 rel1.offset: 1 1;
78 rel2.to: "inset"; 77 rel2.to: "inset";
79 rel2.offset: -2 -2; 78 rel2.offset: -2 -2;
80 fill.smooth: 0;
81 TILED_HORIZ(32)
82 }
83 }
84 part { name: "pat"; mouse_events: 0;
85 description { state: "default" 0.0;
86 image.normal: "dot_pattern.png";
87 rel1.to: "base";
88 rel2.to: "base";
89 TILED_PATTERN(256, 256)
90 }
91 }
92 part { name: "e.background"; type: SWALLOW;
93 clip_to: "clip";
94 description { state: "default" 0.0;
95 rel1.to: "base";
96 rel2.to: "base";
97 }
98 description { state: "hidden" 0.0;
99 inherit: "default" 0.0;
100 visible: 0;
101 } 79 }
102 } 80 }
103 part { name: "bevel"; mouse_events: 0; 81 part { name: "bevel"; mouse_events: 0;
@@ -121,6 +99,7 @@ group { name: "e/modules/pager/desk";
121 description { state: "default" 0.0; 99 description { state: "default" 0.0;
122 rel1.to: "base"; 100 rel1.to: "base";
123 rel2.to: "base"; 101 rel2.to: "base";
102 rel2.offset: -2 -1;
124 } 103 }
125 } 104 }
126 part { name: "shadow"; mouse_events: 0; 105 part { name: "shadow"; mouse_events: 0;
@@ -154,7 +133,7 @@ group { name: "e/modules/pager/desk";
154 rel2.to: "base"; 133 rel2.to: "base";
155 color_class: "module_label_invisible"; 134 color_class: "module_label_invisible";
156 color3: 255 255 255 255; 135 color3: 255 255 255 255;
157 text { font: FN; size: 10; 136 text { font: "Sans"; size: 10;
158 text_class: "module_small"; 137 text_class: "module_small";
159 align: 0.5 0.5; 138 align: 0.5 0.5;
160 } 139 }
@@ -306,16 +285,6 @@ group { name: "e/modules/pager/desk";
306 transition: DECELERATE 0.2; 285 transition: DECELERATE 0.2;
307 target: "glow"; 286 target: "glow";
308 } 287 }
309 program {
310 signal: "e,preview,on"; source: "e";
311 action: STATE_SET "default" 0.0;
312 target: "e.background";
313 }
314 program {
315 signal: "e,preview,off"; source: "e";
316 action: STATE_SET "hidden" 0.0;
317 target: "e.background";
318 }
319 program { name: "drop1"; 288 program { name: "drop1";
320 signal: "e,action,drag,in"; source: "e"; 289 signal: "e,action,drag,in"; source: "e";
321 action: STATE_SET "active" 0.0; 290 action: STATE_SET "active" 0.0;
@@ -354,112 +323,3 @@ group { name: "e/modules/pager/desk";
354 } 323 }
355 } 324 }
356} 325}
357
358group { name: "e/modules/pager/window";
359 images.image: "mini_box_bevel_shadow.png" COMP;
360 images.image: "mini_box_glow.png" COMP;
361 parts {
362 part { name: "base"; type: SPACER;
363 description { state: "default" 0.0;
364 }
365 description { state: "urgent" 0.0;
366 rel1.offset: 0 -5;
367 rel2.offset: -1 -6;
368 }
369 }
370 part { name: "win"; mouse_events: 0;
371 description { state: "default" 0.0;
372 image.normal: "mini_box_bevel_shadow.png";
373 image.border: 7 7 7 7;
374 rel1.offset: -5 -5;
375 rel1.to: "base";
376 rel2.offset: 4 4;
377 rel2.to: "base";
378 }
379 description { state: "active" 0.0;
380 inherit: "default" 0.0;
381 image.normal: "mini_box_glow.png";
382 }
383 }
384 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
385 description { state: "default" 0.0;
386 rel1.to: "base";
387 rel1.offset: 2 2;
388 rel2.to: "base";
389 rel2.offset: -3 -3;
390 align: 1.0 1.0;
391 max: 24 24;
392 aspect: 1.0 1.0; aspect_preference: BOTH;
393 }
394 description { state: "preview" 0.0;
395 inherit: "default" 0.0;
396 visible: 0;
397 }
398 }
399 part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
400 description { state: "default" 0.0;
401 rel1.to: "base";
402 rel2.to: "base";
403 visible: 0;
404 }
405 description { state: "preview" 0.0;
406 inherit: "default" 0.0;
407 visible: 1;
408 }
409 }
410 part { name: "event"; type: RECT;
411 description { state: "default" 0.0;
412 color: 0 0 0 0;
413 }
414 }
415 }
416 programs {
417 program {
418 signal: "e,state,focused"; source: "e";
419 action: STATE_SET "active" 0.0;
420 target: "win";
421 }
422 program {
423 signal: "e,state,unfocused"; source: "e";
424 action: STATE_SET "default" 0.0;
425 target: "win";
426 }
427 program {
428 signal: "e,preview,on"; source: "e";
429 action: STATE_SET "preview" 0.0;
430 target: "e.swallow.content";
431 target: "e.swallow.icon";
432 }
433 program {
434 signal: "e,preview,off"; source: "e";
435 action: STATE_SET "default" 0.0;
436 target: "e.swallow.content";
437 target: "e.swallow.icon";
438 }
439 program { name: "urg1";
440 signal: "e,state,urgent"; source: "e";
441 action: STATE_SET "urgent" 0.0;
442 transition: DECELERATE 0.2;
443 target: "base";
444 after: "urg2";
445 }
446 program { name: "urg2";
447 signal: "e,state,urgent"; source: "e";
448 action: STATE_SET "default" 0.0;
449 transition: ACCELERATE 0.2;
450 target: "base";
451 after: "urg1";
452 }
453 program {
454 signal: "e,state,not_urgent"; source: "e";
455 action: ACTION_STOP;
456 target: "urg1";
457 target: "urg2";
458 after: "urg0";
459 }
460 program { name: "urg0";
461 action: STATE_SET "default" 0.0;
462 target: "base";
463 }
464 }
465}
diff --git a/data/themes/edc/pager16.edc b/data/themes/edc/pager_plain.edc
index 75ab4a1..3e3eaad 100644
--- a/data/themes/edc/pager16.edc
+++ b/data/themes/edc/pager_plain.edc
@@ -1,4 +1,4 @@
1group { name: "e/modules/pager16/popup"; 1group { name: "e/modules/pager_plain/popup";
2 images.image: "vgrad_tall.png" COMP; 2 images.image: "vgrad_tall.png" COMP;
3 images.image: "bevel_out.png" COMP; 3 images.image: "bevel_out.png" COMP;
4 images.image: "shine.png" COMP; 4 images.image: "shine.png" COMP;
@@ -16,8 +16,8 @@ group { name: "e/modules/pager16/popup";
16 image.border: 1 1 1 1; 16 image.border: 1 1 1 1;
17 image.middle: 0; 17 image.middle: 0;
18 fill.smooth: 0; 18 fill.smooth: 0;
19 } 19 }
20 } 20 }
21 part { name: "e.swallow.content"; type: SWALLOW; 21 part { name: "e.swallow.content"; type: SWALLOW;
22 description { state: "default" 0.0; 22 description { state: "default" 0.0;
23 rel1.to_y: "e.text.label"; 23 rel1.to_y: "e.text.label";
@@ -25,8 +25,8 @@ group { name: "e/modules/pager16/popup";
25 rel1.offset: 2 0; 25 rel1.offset: 2 0;
26 rel2.relative: 1.0 1.0; 26 rel2.relative: 1.0 1.0;
27 rel2.offset: -3 -2; 27 rel2.offset: -3 -2;
28 } 28 }
29 } 29 }
30 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 30 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
31 scale: 1; 31 scale: 1;
32 effect: SHADOW BOTTOM; 32 effect: SHADOW BOTTOM;
@@ -59,7 +59,7 @@ group { name: "e/modules/pager16/popup";
59 } 59 }
60} 60}
61 61
62group { name: "e/modules/pager16/desk"; 62group { name: "e/modules/pager_plain/desk";
63 images.image: "vgrad_med_darker.png" COMP; 63 images.image: "vgrad_med_darker.png" COMP;
64 images.image: "bevel_out.png" COMP; 64 images.image: "bevel_out.png" COMP;
65 images.image: "bevel_in.png" COMP; 65 images.image: "bevel_in.png" COMP;
@@ -70,12 +70,34 @@ group { name: "e/modules/pager16/desk";
70 images.image: "mini_blue_glow_arrow_2.png" COMP; 70 images.image: "mini_blue_glow_arrow_2.png" COMP;
71 images.image: "mini_blue_glow_arrow_3.png" COMP; 71 images.image: "mini_blue_glow_arrow_3.png" COMP;
72 parts { 72 parts {
73 part { name: "base"; type: SPACER; 73 part { name: "base";
74 description { state: "default" 0.0; 74 description { state: "default" 0.0;
75 image.normal: "vgrad_med_darker.png";
75 rel1.to: "inset"; 76 rel1.to: "inset";
76 rel1.offset: 1 1; 77 rel1.offset: 1 1;
77 rel2.to: "inset"; 78 rel2.to: "inset";
78 rel2.offset: -2 -2; 79 rel2.offset: -2 -2;
80 fill.smooth: 0;
81 TILED_HORIZ(32)
82 }
83 }
84 part { name: "pat"; mouse_events: 0;
85 description { state: "default" 0.0;
86 image.normal: "dot_pattern.png";
87 rel1.to: "base";
88 rel2.to: "base";
89 TILED_PATTERN(256, 256)
90 }
91 }
92 part { name: "e.background"; type: SWALLOW;
93 clip_to: "clip";
94 description { state: "default" 0.0;
95 rel1.to: "base";
96 rel2.to: "base";
97 }
98 description { state: "hidden" 0.0;
99 inherit: "default" 0.0;
100 visible: 0;
79 } 101 }
80 } 102 }
81 part { name: "bevel"; mouse_events: 0; 103 part { name: "bevel"; mouse_events: 0;
@@ -99,7 +121,6 @@ group { name: "e/modules/pager16/desk";
99 description { state: "default" 0.0; 121 description { state: "default" 0.0;
100 rel1.to: "base"; 122 rel1.to: "base";
101 rel2.to: "base"; 123 rel2.to: "base";
102 rel2.offset: -2 -1;
103 } 124 }
104 } 125 }
105 part { name: "shadow"; mouse_events: 0; 126 part { name: "shadow"; mouse_events: 0;
@@ -133,7 +154,7 @@ group { name: "e/modules/pager16/desk";
133 rel2.to: "base"; 154 rel2.to: "base";
134 color_class: "module_label_invisible"; 155 color_class: "module_label_invisible";
135 color3: 255 255 255 255; 156 color3: 255 255 255 255;
136 text { font: "Sans"; size: 10; 157 text { font: FN; size: 10;
137 text_class: "module_small"; 158 text_class: "module_small";
138 align: 0.5 0.5; 159 align: 0.5 0.5;
139 } 160 }
@@ -285,6 +306,16 @@ group { name: "e/modules/pager16/desk";
285 transition: DECELERATE 0.2; 306 transition: DECELERATE 0.2;
286 target: "glow"; 307 target: "glow";
287 } 308 }
309 program {
310 signal: "e,preview,on"; source: "e";
311 action: STATE_SET "default" 0.0;
312 target: "e.background";
313 }
314 program {
315 signal: "e,preview,off"; source: "e";
316 action: STATE_SET "hidden" 0.0;
317 target: "e.background";
318 }
288 program { name: "drop1"; 319 program { name: "drop1";
289 signal: "e,action,drag,in"; source: "e"; 320 signal: "e,action,drag,in"; source: "e";
290 action: STATE_SET "active" 0.0; 321 action: STATE_SET "active" 0.0;
@@ -323,3 +354,112 @@ group { name: "e/modules/pager16/desk";
323 } 354 }
324 } 355 }
325} 356}
357
358group { name: "e/modules/pager_plain/window";
359 images.image: "mini_box_bevel_shadow.png" COMP;
360 images.image: "mini_box_glow.png" COMP;
361 parts {
362 part { name: "base"; type: SPACER;
363 description { state: "default" 0.0;
364 }
365 description { state: "urgent" 0.0;
366 rel1.offset: 0 -5;
367 rel2.offset: -1 -6;
368 }
369 }
370 part { name: "win"; mouse_events: 0;
371 description { state: "default" 0.0;
372 image.normal: "mini_box_bevel_shadow.png";
373 image.border: 7 7 7 7;
374 rel1.offset: -5 -5;
375 rel1.to: "base";
376 rel2.offset: 4 4;
377 rel2.to: "base";
378 }
379 description { state: "active" 0.0;
380 inherit: "default" 0.0;
381 image.normal: "mini_box_glow.png";
382 }
383 }
384 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
385 description { state: "default" 0.0;
386 rel1.to: "base";
387 rel1.offset: 2 2;
388 rel2.to: "base";
389 rel2.offset: -3 -3;
390 align: 1.0 1.0;
391 max: 24 24;
392 aspect: 1.0 1.0; aspect_preference: BOTH;
393 }
394 description { state: "preview" 0.0;
395 inherit: "default" 0.0;
396 visible: 0;
397 }
398 }
399 part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
400 description { state: "default" 0.0;
401 rel1.to: "base";
402 rel2.to: "base";
403 visible: 0;
404 }
405 description { state: "preview" 0.0;
406 inherit: "default" 0.0;
407 visible: 1;
408 }
409 }
410 part { name: "event"; type: RECT;
411 description { state: "default" 0.0;
412 color: 0 0 0 0;
413 }
414 }
415 }
416 programs {
417 program {
418 signal: "e,state,focused"; source: "e";
419 action: STATE_SET "active" 0.0;
420 target: "win";
421 }
422 program {
423 signal: "e,state,unfocused"; source: "e";
424 action: STATE_SET "default" 0.0;
425 target: "win";
426 }
427 program {
428 signal: "e,preview,on"; source: "e";
429 action: STATE_SET "preview" 0.0;
430 target: "e.swallow.content";
431 target: "e.swallow.icon";
432 }
433 program {
434 signal: "e,preview,off"; source: "e";
435 action: STATE_SET "default" 0.0;
436 target: "e.swallow.content";
437 target: "e.swallow.icon";
438 }
439 program { name: "urg1";
440 signal: "e,state,urgent"; source: "e";
441 action: STATE_SET "urgent" 0.0;
442 transition: DECELERATE 0.2;
443 target: "base";
444 after: "urg2";
445 }
446 program { name: "urg2";
447 signal: "e,state,urgent"; source: "e";
448 action: STATE_SET "default" 0.0;
449 transition: ACCELERATE 0.2;
450 target: "base";
451 after: "urg1";
452 }
453 program {
454 signal: "e,state,not_urgent"; source: "e";
455 action: ACTION_STOP;
456 target: "urg1";
457 target: "urg2";
458 after: "urg0";
459 }
460 program { name: "urg0";
461 action: STATE_SET "default" 0.0;
462 target: "base";
463 }
464 }
465}