Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_border.edc default_clock.edc
Log Message:
patches patches...
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_border.edc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- default_border.edc 22 Jun 2005 07:24:24 -0000 1.17
+++ default_border.edc 13 Jul 2005 02:59:30 -0000 1.18
@@ -226,6 +226,17 @@
image: "e17_button_detail_minimize.png" COMP;
image: "e17_button_detail_shade.png" COMP;
image: "e17_button_detail_stick.png" COMP;
+ image: "e17_button_detail_locks.png" COMP;
+ image: "e17_button_detail_borderless.png" COMP;
+ image: "e17_button_detail_remember.png" COMP;
+ image: "e17_button_detail_skip_winlist.png" COMP;
+ image: "e17_button_detail_fullscreen.png" COMP;
+ image: "e17_button_detail_sendto.png" COMP;
+ image: "e17_button_detail_kill.png" COMP;
+ image: "e17_button_detail_stacking.png" COMP;
+ image: "e17_button_detail_stack_below.png" COMP;
+ image: "e17_button_detail_stack_normal.png" COMP;
+ image: "e17_button_detail_stack_on_top.png" COMP;
image: "e17_mini_button.png" COMP;
image: "e17_mini_button_shadow1.png" COMP;
image: "e17_mini_button_shadow2.png" COMP;
@@ -1664,4 +1675,15 @@
FULL_SIZE_BORDER_BUTTON("maximize")
FULL_SIZE_BORDER_BUTTON("shade")
FULL_SIZE_BORDER_BUTTON("stick")
+FULL_SIZE_BORDER_BUTTON("kill")
+FULL_SIZE_BORDER_BUTTON("locks")
+FULL_SIZE_BORDER_BUTTON("borderless")
+FULL_SIZE_BORDER_BUTTON("fullscreen")
+FULL_SIZE_BORDER_BUTTON("remember")
+FULL_SIZE_BORDER_BUTTON("skip_winlist")
+FULL_SIZE_BORDER_BUTTON("sendto")
+FULL_SIZE_BORDER_BUTTON("stacking")
+FULL_SIZE_BORDER_BUTTON("stack_on_top")
+FULL_SIZE_BORDER_BUTTON("stack_normal")
+FULL_SIZE_BORDER_BUTTON("stack_below")
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_clock.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- default_clock.edc 12 Jul 2005 03:53:41 -0000 1.4
+++ default_clock.edc 13 Jul 2005 02:59:30 -0000 1.5
@@ -1,7 +1,8 @@
images {
image: "e17_clock_bg.png" COMP;
image: "e17_clock_fg.png" COMP;
- image: "e17_button.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;
@@ -196,11 +197,11 @@
new isAfternoon;
new digiBuf[2];
new digitalStyle;
- new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_MILITARY;
+ new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR;
DIGITAL_STYLE_NONE = 0;
DIGITAL_STYLE_NORMAL = 1;
- DIGITAL_STYLE_MILITARY = 2;
+ DIGITAL_STYLE_24HOUR = 2;
get_text(PART:"digitalStyle", digiBuf, 2);
@@ -248,13 +249,17 @@
isAfternoon = 0;
v = hour;
if (hour >= 12 && hour < 24) { isAfternoon = 1; }
- if (digitalStyle == DIGITAL_STYLE_MILITARY) {
+ if (digitalStyle == DIGITAL_STYLE_24HOUR) {
if (v == 0) { v = 24; }
} else {
v = (v % 12);
if (v == 0) { v = 12; }
}
- snprintf(buf, 10, "%i", v);
+ 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;
@@ -268,17 +273,19 @@
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_MILITARY) {
- snprintf(digitalVal, 14, "%s:%s:%s", hourStr,
minuteStr, secondStr);
+ } 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);
}
}
}
@@ -588,30 +595,82 @@
}
}
part {
- name: "digital_bg";
+ name: "digital_bg_area";
+ type: "RECT";
mouse_events: 0;
description {
- state: "digital" 0.0;
- image {
- normal: "e17_button.png";
+ 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 {
- relative: 0.0 1.0;
+ to: "digital_bg_area";
+ relative: 0.0 0.0;
}
rel2 {
- relative: 1.0 1.2;
+ 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_button.png";
+ 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 {
- relative: 0.0 0.0;
+ 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;
}
}
}
@@ -620,34 +679,28 @@
type: TEXT;
effect: SOFT_SHADOW;
description {
- state: "digital" 0.0;
- min: 0 11;
+ state: "default" 0.0;
rel1 {
- relative: 0.0 0.9;
+ to: "digital_bg_area";
+ offset: 3 4;
}
rel2 {
- relative: 1.0 1.0;
+ 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: 7;
- min: 1 0;
+ size: 15;
fit: 0 1;
- align: 0.5 1.0;
+ align: 0.0 0.5;
}
}
description {
state: "hidden" 0.0;
- aspect: 0.0 0.0;
- rel1 {
- relative: 0.0 0.0;
- }
- rel2 {
- relative: 0.0 0.0;
- }
+ visible: 0;
}
}
part {
@@ -655,13 +708,7 @@
type: TEXT;
description {
state: "hidden" 0.0;
- aspect: 0.0 0.0;
- rel1 {
- relative: 0.0 0.0;
- }
- rel2 {
- relative: 0.0 0.0;
- }
+ visible: 0;
}
}
}
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
