discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e3e158b3887a93097d954a75d2d74eff3f4ec24f
commit e3e158b3887a93097d954a75d2d74eff3f4ec24f
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Wed Sep 10 09:04:14 2014 -0400
rename all pager theme groups to match the module that uses it
this should have been done with the module rename, and this release is the
last chance to get it fixed before it has to be permanently maintained with
wrong names
---
data/themes/Makefile.am | 2 +-
data/themes/default.edc | 2 +-
data/themes/edc/pager.edc | 154 +---------------------
data/themes/edc/{pager16.edc => pager_plain.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 \
edc/notification.edc \
edc/packagekit.edc \
edc/pager.edc \
-edc/pager16.edc \
+edc/pager_plain.edc \
edc/pointer.edc \
edc/preview.edc \
edc/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 {
// modules
#include "edc/start.edc"
#include "edc/pager.edc"
-#include "edc/pager16.edc"
+#include "edc/pager_plain.edc"
#include "edc/xkbswitch.edc"
#include "edc/tasks.edc"
#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";
image.border: 1 1 1 1;
image.middle: 0;
fill.smooth: 0;
- }
- }
+ }
+ }
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1.to_y: "e.text.label";
@@ -25,8 +25,8 @@ group { name: "e/modules/pager/popup";
rel1.offset: 2 0;
rel2.relative: 1.0 1.0;
rel2.offset: -3 -2;
- }
- }
+ }
+ }
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SHADOW BOTTOM;
@@ -70,34 +70,12 @@ group { name: "e/modules/pager/desk";
images.image: "mini_blue_glow_arrow_2.png" COMP;
images.image: "mini_blue_glow_arrow_3.png" COMP;
parts {
- part { name: "base";
+ part { name: "base"; type: SPACER;
description { state: "default" 0.0;
- image.normal: "vgrad_med_darker.png";
rel1.to: "inset";
rel1.offset: 1 1;
rel2.to: "inset";
rel2.offset: -2 -2;
- fill.smooth: 0;
- TILED_HORIZ(32)
- }
- }
- part { name: "pat"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "dot_pattern.png";
- rel1.to: "base";
- rel2.to: "base";
- TILED_PATTERN(256, 256)
- }
- }
- part { name: "e.background"; type: SWALLOW;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
}
}
part { name: "bevel"; mouse_events: 0;
@@ -121,6 +99,7 @@ group { name: "e/modules/pager/desk";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
+ rel2.offset: -2 -1;
}
}
part { name: "shadow"; mouse_events: 0;
@@ -154,7 +133,7 @@ group { name: "e/modules/pager/desk";
rel2.to: "base";
color_class: "module_label_invisible";
color3: 255 255 255 255;
- text { font: FN; size: 10;
+ text { font: "Sans"; size: 10;
text_class: "module_small";
align: 0.5 0.5;
}
@@ -306,16 +285,6 @@ group { name: "e/modules/pager/desk";
transition: DECELERATE 0.2;
target: "glow";
}
- program {
- signal: "e,preview,on"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "e.background";
- }
- program {
- signal: "e,preview,off"; source: "e";
- action: STATE_SET "hidden" 0.0;
- target: "e.background";
- }
program { name: "drop1";
signal: "e,action,drag,in"; source: "e";
action: STATE_SET "active" 0.0;
@@ -354,112 +323,3 @@ group { name: "e/modules/pager/desk";
}
}
}
-
-group { name: "e/modules/pager/window";
- images.image: "mini_box_bevel_shadow.png" COMP;
- images.image: "mini_box_glow.png" COMP;
- parts {
- part { name: "base"; type: SPACER;
- description { state: "default" 0.0;
- }
- description { state: "urgent" 0.0;
- rel1.offset: 0 -5;
- rel2.offset: -1 -6;
- }
- }
- part { name: "win"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "mini_box_bevel_shadow.png";
- image.border: 7 7 7 7;
- rel1.offset: -5 -5;
- rel1.to: "base";
- rel2.offset: 4 4;
- rel2.to: "base";
- }
- description { state: "active" 0.0;
- inherit: "default" 0.0;
- image.normal: "mini_box_glow.png";
- }
- }
- part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 2 2;
- rel2.to: "base";
- rel2.offset: -3 -3;
- align: 1.0 1.0;
- max: 24 24;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- }
- description { state: "preview" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- visible: 0;
- }
- description { state: "preview" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "event"; type: RECT;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- }
- programs {
- program {
- signal: "e,state,focused"; source: "e";
- action: STATE_SET "active" 0.0;
- target: "win";
- }
- program {
- signal: "e,state,unfocused"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "win";
- }
- program {
- signal: "e,preview,on"; source: "e";
- action: STATE_SET "preview" 0.0;
- target: "e.swallow.content";
- target: "e.swallow.icon";
- }
- program {
- signal: "e,preview,off"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "e.swallow.content";
- target: "e.swallow.icon";
- }
- program { name: "urg1";
- signal: "e,state,urgent"; source: "e";
- action: STATE_SET "urgent" 0.0;
- transition: DECELERATE 0.2;
- target: "base";
- after: "urg2";
- }
- program { name: "urg2";
- signal: "e,state,urgent"; source: "e";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.2;
- target: "base";
- after: "urg1";
- }
- program {
- signal: "e,state,not_urgent"; source: "e";
- action: ACTION_STOP;
- target: "urg1";
- target: "urg2";
- after: "urg0";
- }
- program { name: "urg0";
- action: STATE_SET "default" 0.0;
- target: "base";
- }
- }
-}
diff --git a/data/themes/edc/pager16.edc b/data/themes/edc/pager_plain.edc
similarity index 69%
rename from data/themes/edc/pager16.edc
rename to 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 @@
-group { name: "e/modules/pager16/popup";
+group { name: "e/modules/pager_plain/popup";
images.image: "vgrad_tall.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
@@ -16,8 +16,8 @@ group { name: "e/modules/pager16/popup";
image.border: 1 1 1 1;
image.middle: 0;
fill.smooth: 0;
- }
- }
+ }
+ }
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1.to_y: "e.text.label";
@@ -25,8 +25,8 @@ group { name: "e/modules/pager16/popup";
rel1.offset: 2 0;
rel2.relative: 1.0 1.0;
rel2.offset: -3 -2;
- }
- }
+ }
+ }
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SHADOW BOTTOM;
@@ -59,7 +59,7 @@ group { name: "e/modules/pager16/popup";
}
}
-group { name: "e/modules/pager16/desk";
+group { name: "e/modules/pager_plain/desk";
images.image: "vgrad_med_darker.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "bevel_in.png" COMP;
@@ -70,12 +70,34 @@ group { name: "e/modules/pager16/desk";
images.image: "mini_blue_glow_arrow_2.png" COMP;
images.image: "mini_blue_glow_arrow_3.png" COMP;
parts {
- part { name: "base"; type: SPACER;
+ part { name: "base";
description { state: "default" 0.0;
+ image.normal: "vgrad_med_darker.png";
rel1.to: "inset";
rel1.offset: 1 1;
rel2.to: "inset";
rel2.offset: -2 -2;
+ fill.smooth: 0;
+ TILED_HORIZ(32)
+ }
+ }
+ part { name: "pat"; mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "dot_pattern.png";
+ rel1.to: "base";
+ rel2.to: "base";
+ TILED_PATTERN(256, 256)
+ }
+ }
+ part { name: "e.background"; type: SWALLOW;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
}
}
part { name: "bevel"; mouse_events: 0;
@@ -99,7 +121,6 @@ group { name: "e/modules/pager16/desk";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
- rel2.offset: -2 -1;
}
}
part { name: "shadow"; mouse_events: 0;
@@ -133,7 +154,7 @@ group { name: "e/modules/pager16/desk";
rel2.to: "base";
color_class: "module_label_invisible";
color3: 255 255 255 255;
- text { font: "Sans"; size: 10;
+ text { font: FN; size: 10;
text_class: "module_small";
align: 0.5 0.5;
}
@@ -285,6 +306,16 @@ group { name: "e/modules/pager16/desk";
transition: DECELERATE 0.2;
target: "glow";
}
+ program {
+ signal: "e,preview,on"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "e.background";
+ }
+ program {
+ signal: "e,preview,off"; source: "e";
+ action: STATE_SET "hidden" 0.0;
+ target: "e.background";
+ }
program { name: "drop1";
signal: "e,action,drag,in"; source: "e";
action: STATE_SET "active" 0.0;
@@ -323,3 +354,112 @@ group { name: "e/modules/pager16/desk";
}
}
}
+
+group { name: "e/modules/pager_plain/window";
+ images.image: "mini_box_bevel_shadow.png" COMP;
+ images.image: "mini_box_glow.png" COMP;
+ parts {
+ part { name: "base"; type: SPACER;
+ description { state: "default" 0.0;
+ }
+ description { state: "urgent" 0.0;
+ rel1.offset: 0 -5;
+ rel2.offset: -1 -6;
+ }
+ }
+ part { name: "win"; mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "mini_box_bevel_shadow.png";
+ image.border: 7 7 7 7;
+ rel1.offset: -5 -5;
+ rel1.to: "base";
+ rel2.offset: 4 4;
+ rel2.to: "base";
+ }
+ description { state: "active" 0.0;
+ inherit: "default" 0.0;
+ image.normal: "mini_box_glow.png";
+ }
+ }
+ part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel1.offset: 2 2;
+ rel2.to: "base";
+ rel2.offset: -3 -3;
+ align: 1.0 1.0;
+ max: 24 24;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ }
+ description { state: "preview" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ visible: 0;
+ }
+ description { state: "preview" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "event"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "e,state,focused"; source: "e";
+ action: STATE_SET "active" 0.0;
+ target: "win";
+ }
+ program {
+ signal: "e,state,unfocused"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "win";
+ }
+ program {
+ signal: "e,preview,on"; source: "e";
+ action: STATE_SET "preview" 0.0;
+ target: "e.swallow.content";
+ target: "e.swallow.icon";
+ }
+ program {
+ signal: "e,preview,off"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "e.swallow.content";
+ target: "e.swallow.icon";
+ }
+ program { name: "urg1";
+ signal: "e,state,urgent"; source: "e";
+ action: STATE_SET "urgent" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base";
+ after: "urg2";
+ }
+ program { name: "urg2";
+ signal: "e,state,urgent"; source: "e";
+ action: STATE_SET "default" 0.0;
+ transition: ACCELERATE 0.2;
+ target: "base";
+ after: "urg1";
+ }
+ program {
+ signal: "e,state,not_urgent"; source: "e";
+ action: ACTION_STOP;
+ target: "urg1";
+ target: "urg2";
+ after: "urg0";
+ }
+ program { name: "urg0";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ }
+ }
+}
--
