Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_battery.edc default_clock.edc default_ibar.edc
default_pager.edc
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===================================================================
RCS file: /cvs/e/e17/apps/e/data/themes/default_battery.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- default_battery.edc 19 Mar 2006 12:24:19 -0000 1.5
+++ default_battery.edc 20 Apr 2006 11:30:23 -0000 1.6
@@ -115,6 +115,31 @@
}
}
part {
+ name: "ac";
+ clip_to: "fade_clip";
+ description {
+ state: "default" 0.0;
+ aspect: 0.975609756 0.975609756;
+ align: 1.0 1.0;
+ max: 40 41;
+ visible: 0;
+ rel1 {
+ relative: 0.5 0.5;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ }
+ image {
+ normal: "e17_battery_ac.png";
+ }
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part {
name: "reading";
type: TEXT;
effect: SOFT_SHADOW;
@@ -168,31 +193,6 @@
align: 1.0 0.0;
text_class: "battery";
}
- }
- }
- part {
- name: "ac";
- clip_to: "fade_clip";
- description {
- state: "default" 0.0;
- aspect: 0.975609756 0.975609756;
- align: 1.0 1.0;
- max: 40 41;
- visible: 0;
- rel1 {
- relative: 0.5 0.5;
- }
- rel2 {
- relative: 1.0 1.0;
- }
- image {
- normal: "e17_battery_ac.png";
- }
- }
- description {
- state: "active" 0.0;
- inherit: "default" 0.0;
- visible: 1;
}
}
part {
===================================================================
RCS file: /cvs/e/e17/apps/e/data/themes/default_clock.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- default_clock.edc 19 Mar 2006 12:24:19 -0000 1.10
+++ default_clock.edc 20 Apr 2006 11:30:23 -0000 1.11
@@ -1,8 +1,6 @@
images {
image: "e17_clock_bg.png" COMP;
image: "e17_clock_fg.png" COMP;
- image: "e17_ibar_over_h.png" COMP;
- image: "e17_ibar_bg_h.png" COMP;
image: "e17_clock_seconds_00.png" COMP;
image: "e17_clock_seconds_01.png" COMP;
image: "e17_clock_seconds_02.png" COMP;
@@ -189,24 +187,10 @@
script {
public clock_cb(val) {
new buf[11];
- new digitalVal[15];
- new hourStr[4], minuteStr[4], secondStr[4];
new year, month, day, yearday, weekday, hour, minute;
new Float:second;
new v;
- new isAfternoon;
- new digiBuf[2];
- new digitalStyle;
- new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR;
-
- DIGITAL_STYLE_NONE = 0;
- DIGITAL_STYLE_NORMAL = 1;
- DIGITAL_STYLE_24HOUR = 2;
-
- get_text(PART:"digitalStyle", digiBuf, 2);
-
- digitalStyle = atoi(digiBuf);
-
+
date(year, month, day, yearday, weekday, hour, minute, second);
v = round(second);
#if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE !=
MEDIUMRES_PDA
@@ -216,7 +200,6 @@
#endif
#if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE !=
MEDIUMRES_PDA
buf[0] = 0;
- digitalVal[0] = 0;
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else {snprintf(buf, 10, "%i", v);}
set_state(PART:"seconds", buf, 0.0);
@@ -232,59 +215,6 @@
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else {snprintf(buf, 10, "%i", v);}
set_state(PART:"hour", buf, 0.0);
-
-
- buf[0] = 0;
- v = round(second);
- if (v < 10) {snprintf(buf, 10, "0%i", v);}
- else {snprintf(buf, 10, "%i", v);}
- snprintf(secondStr, 3, "%s", buf);
-
- buf[0] = 0;
- if (minute < 10) {snprintf(buf, 10, "0%i", minute);}
- else {snprintf(buf, 10, "%i", minute);}
- snprintf(minuteStr, 3, "%s", buf);
-
- buf[0] = 0;
- isAfternoon = 0;
- v = hour;
- if (hour >= 12 && hour < 24) { isAfternoon = 1; }
- if (digitalStyle == DIGITAL_STYLE_NORMAL) {
- v = (v % 12);
- if (v == 0) { v = 12; }
- }
- if (digitalStyle == DIGITAL_STYLE_24HOUR && v < 10) {
- snprintf(buf, 10, "0%i", v);
- } else {
- snprintf(buf, 10, "%i", v);
- }
- snprintf(hourStr, 3, "%s", buf);
-
- buf[0] = 0;
-
- if (isAfternoon == 1) {
- snprintf(buf, 10, "PM");
- } else {
- snprintf(buf, 10, "AM");
- }
-
- if (digitalStyle != DIGITAL_STYLE_NONE) {
- if (digitalStyle == DIGITAL_STYLE_NORMAL) {
- snprintf(digitalVal, 14, "%s:%s:%s %s", hourStr, minuteStr,
secondStr, buf);
- } else if (digitalStyle == DIGITAL_STYLE_24HOUR) {
- snprintf(digitalVal, 14, " %s:%s:%s ", hourStr, minuteStr,
secondStr);
- }
-
- set_text(PART:"digital", digitalVal);
- set_state(PART:"digital", "digital", 0.0);
- set_state(PART:"digital_bg", "digital", 0.0);
- set_state(PART:"digital_bg_overlay", "digital", 0.0);
- } else {
- set_text(PART:"digital", "");
- set_state(PART:"digital", "hidden", 0.0);
- set_state(PART:"digital_bg", "hidden", 0.0);
- set_state(PART:"digital_bg_overlay", "hidden", 0.0);
- }
}
}
parts {
@@ -310,10 +240,10 @@
state: "default" 0.0;
aspect: 1.0 1.0;
rel1 {
- relative: 0.1 0.1;
+ relative: 0.05 0.05;
}
rel2 {
- relative: 0.9 0.9;
+ relative: 0.95 0.95;
}
image {
normal: "e17_clock_"IND"_00.png";
@@ -403,10 +333,10 @@
state: "default" 0.0;
aspect: 1.0 1.0;
rel1 {
- relative: 0.1 0.1;
+ relative: 0.05 0.05;
}
rel2 {
- relative: 0.9 0.9;
+ relative: 0.95 0.95;
}
image {
normal: "e17_clock_"IND"_00.png";
@@ -495,10 +425,10 @@
state: "default" 0.0;
aspect: 1.0 1.0;
rel1 {
- relative: 0.2 0.2;
+ relative: 0.1 0.1;
}
rel2 {
- relative: 0.8 0.8;
+ relative: 0.9 0.9;
}
image {
normal: "e17_clock_"IND"_00.png";
@@ -590,124 +520,6 @@
image {
normal: "e17_clock_fg.png";
}
- }
- }
- part {
- name: "digital_bg_area";
- type: "RECT";
- mouse_events: 0;
- description {
- state: "default" 0.0;
- min: 16 16;
- rel1 {
- relative: 0.0 0.8;
- }
- rel2 {
- relative: 1.0 1.0;
- }
- visible: 0;
- }
- }
- part {
- name: "digital_bg_overlay";
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- to: "digital_bg_area";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "digital_bg_area";
- relative: 1.0 1.0;
- }
- image {
- normal: "e17_ibar_over_h.png";
- border: 13 13 13 13;
- }
- fill {
- smooth: 0;
- }
- color: 255 255 255 192;
- }
- description {
- state: "hidden" 0.0;
- visible: 0;
- image {
- normal: "e17_ibar_over_h.png";
- border: 13 13 13 13;
- middle: 0;
- }
- }
- }
- part {
- name: "digital_bg";
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- to: "digital_bg_area";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "digital_bg_area";
- relative: 1.0 1.0;
- }
- image {
- normal: "e17_ibar_bg_h.png";
- border: 6 6 6 6;
- }
- fill {
- smooth: 0;
- }
- color: 255 255 255 128;
- }
- description {
- state: "hidden" 0.0;
- visible: 0;
- image {
- normal: "e17_ibar_bg_h.png";
- border: 6 6 6 6;
- middle: 0;
- }
- }
- }
- part {
- name: "digital";
- type: TEXT;
- effect: SOFT_SHADOW;
- description {
- state: "default" 0.0;
- rel1 {
- to: "digital_bg_area";
- offset: 3 4;
- }
- rel2 {
- to: "digital_bg_area";
- offset: -2 -2;
- }
- color: 255 255 255 255;
- color3: 0 0 0 32;
- text {
- text: "00:00:00 AM";
- font: "Edje-Vera";
- size: 15;
- fit: 0 1;
- align: 0.5 0.5;
- text_class: "clock";
- }
- }
- description {
- state: "hidden" 0.0;
- visible: 0;
- }
- }
- part {
- name: "digitalStyle";
- type: TEXT;
- description {
- state: "hidden" 0.0;
- visible: 0;
}
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/data/themes/default_ibar.edc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- default_ibar.edc 20 Sep 2005 08:34:23 -0000 1.12
+++ default_ibar.edc 20 Apr 2006 11:30:23 -0000 1.13
@@ -621,18 +621,55 @@
state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
- offset: 4 4;
+ offset: 2 2;
}
rel2 {
relative: 1.0 1.0;
- offset: -5 -5;
+ offset: -3 -3;
}
color: 0 0 0 0;
}
+ description {
+ state: "bigger" 0.0;
+ inherit: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ }
+ part {
+ name: "over";
+ type: RECT;
+ repeat_events: 0;
+ description {
+ state: "default" 0.0;
+ color: 0 0 0 0;
+ }
}
}
programs {
program {
+ name: "hover_in";
+ signal: "mouse,in";
+ source: "over";
+ action: STATE_SET "bigger" 0.0;
+ transition: LINEAR 0.1;
+ target: "item";
+ }
+ program {
+ name: "hover_out";
+ signal: "mouse,out";
+ source: "over";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.2;
+ target: "item";
+ }
+ program {
name: "exec_start";
signal: "start";
source: "";
@@ -671,12 +708,6 @@
mouse_events: 0;
description {
state: "default" 0.0;
- rel1 {
- offset: 4 4;
- }
- rel2 {
- offset: -5 -5;
- }
color: 255 255 255 0;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/data/themes/default_pager.edc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- default_pager.edc 29 Mar 2006 00:35:16 -0000 1.24
+++ default_pager.edc 20 Apr 2006 11:30:23 -0000 1.25
@@ -151,10 +151,64 @@
}
}
part {
- name: "pager";
+ name: "background";
mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ to: "overlay";
+ }
+ rel2 {
+ to: "overlay";
+ }
+ image {
+ normal: "e17_ibar_bg_h.png";
+ border: 6 6 6 6;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ }
+ part {
+ name: "items_clip";
+ type: RECT;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ to: "background";
+ offset: 4 4;
+ }
+ rel2 {
+ to: "background";
+ offset: -5 -5;
+ }
+ color: 255 255 255 255;
+ }
+ }
+ part {
+ name: "pager";
type: SWALLOW;
- description {
+ mouse_events: 0;
+ clip_to: "items_clip";
+ description {
+ state: "default" 0.0;
+ rel1 {
+ to: "overlay";
+ offset: 4 4;
+ }
+ rel2 {
+ to: "overlay";
+ offset: -5 -5;
+ }
+ color: 0 0 0 0;
+ }
+ }
+ part {
+ name: "overlay";
+ mouse_events: 0;
+ description {
state: "default" 0.0;
rel1 {
to_y: "title_overlay";
@@ -165,7 +219,14 @@
relative: 1.0 1.0;
offset: -17 -17;
}
- color: 0 0 0 0;
+ image {
+ normal: "e17_ibar_over_h.png";
+ border: 13 13 13 13;
+ middle: 0;
+ }
+ fill {
+ smooth: 0;
+ }
}
}
}
@@ -377,7 +438,8 @@
}
part {
name: "overlay";
- mouse_events: 0;
+ repeat_events: 1;
+// mouse_events: 0;
description {
state: "default" 0.0;
rel1 {
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
