Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default.edc default_battery.edc default_border.edc
default_clock.edc default_cpufreq.edc default_dialog.edc
default_error.edc default_menu.edc default_move.edc
default_pager.edc default_resize.edc default_temperature.edc
default_winlist.edc
Log Message:
edje +tb2 now usinged in e17
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default.edc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- default.edc 6 Sep 2005 05:19:15 -0000 1.40
+++ default.edc 18 Sep 2005 06:27:46 -0000 1.41
@@ -17,8 +17,8 @@
#endif
fonts {
- font: "Vera.ttf" "Edje Vera";
- font: "VeraBd.ttf" "Edje Vera Bold";
+ font: "Vera.ttf" "Edje-Vera";
+ font: "VeraBd.ttf" "Edje-Vera-Bold";
}
collections {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_battery.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default_battery.edc 11 Jan 2005 07:08:29 -0000 1.3
+++ default_battery.edc 18 Sep 2005 06:27:46 -0000 1.4
@@ -133,7 +133,7 @@
color3: 0 0 0 32;
text {
text: "100%";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 7;
min: 1 1;
align: 1.0 0.0;
@@ -161,7 +161,7 @@
color3: 0 0 0 32;
text {
text: "00:00";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 7;
min: 1 1;
align: 1.0 0.0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_border.edc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- default_border.edc 18 Aug 2005 06:15:41 -0000 1.21
+++ default_border.edc 18 Sep 2005 06:27:46 -0000 1.22
@@ -788,7 +788,7 @@
color3: 255 255 255 128;
text {
text: "";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 10;
min: 0 1;
align: 0.0 0.5;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_clock.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- default_clock.edc 19 Jul 2005 11:07:18 -0000 1.6
+++ default_clock.edc 18 Sep 2005 06:27:47 -0000 1.7
@@ -690,7 +690,7 @@
color3: 0 0 0 32;
text {
text: "00:00:00 AM";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 15;
fit: 0 1;
align: 0.0 0.5;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_cpufreq.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default_cpufreq.edc 19 Apr 2005 03:51:40 -0000 1.2
+++ default_cpufreq.edc 18 Sep 2005 06:27:47 -0000 1.3
@@ -305,7 +305,7 @@
color3: 0 0 0 32;
text {
text: "??? Ghz";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 7;
align: 0.5 0.5;
min: 1 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_dialog.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default_dialog.edc 25 Aug 2005 15:43:38 -0000 1.2
+++ default_dialog.edc 18 Sep 2005 06:27:47 -0000 1.3
@@ -6,6 +6,17 @@
image: "e17_button.png" COMP;
}
+styles
+{
+ style {
+ name: "dialog_style";
+ base: "font=Edje-Vera font_size=10 align=left color=#000 style=shadow
shadow_color=#ffffff80 wrap=word";
+
+ tag: "br" "\n";
+ tag: "hilight" "+ font_size=10 font=Edje-Vera-Bold style=glow
color=#fff glow2_color=#fe87 glow_color=#fa14";
+ }
+}
+
group {
name: "widgets/dialog/main";
parts {
@@ -220,7 +231,7 @@
color3: 255 255 255 128;
text {
text: "OK";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 10;
min: 0 0;
align: 0.5 0.5;
@@ -251,3 +262,21 @@
}
}
}
+
+group {
+ name: "widgets/dialog/text";
+ parts {
+ part {
+ name: "text";
+ type: TEXTBLOCK;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ text {
+ style: "dialog_style";
+ min: 1 1;
+ }
+ }
+ }
+ }
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_error.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- default_error.edc 31 Mar 2005 11:40:37 -0000 1.4
+++ default_error.edc 18 Sep 2005 06:27:47 -0000 1.5
@@ -4,6 +4,17 @@
image: "e17_button.png" COMP;
}
+styles
+{
+ style {
+ name: "error_style";
+ base: "font=Edje-Vera font_size=10 align=left color=#000 style=shadow
shadow_color=#ffffff80 wrap=word";
+
+ tag: "br" "\n";
+ tag: "hilight" "+ font_size=10 font=Edje-Vera-Bold style=glow
color=#fff glow2_color=#fe87 glow_color=#fa14";
+ }
+}
+
group {
name: "error/main";
min: 400 200;
@@ -113,7 +124,7 @@
color3: 255 255 255 128;
text {
text: "Title";
- font: "Edje Vera Bold";
+ font: "Edje-Vera-Bold";
size: 12;
min: 0 0;
align: 0.0 0.5;
@@ -122,7 +133,7 @@
}
part {
name: "text";
- type: SWALLOW;
+ type: TEXTBLOCK;
mouse_events: 0;
description {
state: "default" 0.0;
@@ -133,10 +144,14 @@
}
rel2 {
relative: 1.0 0.0;
- offset: -1 -16;
+ offset: -17 -17;
to_y: "button_image";
}
- color: 0 0 0 0;
+ text {
+ style: "error_style";
+ min: 1 1;
+ text: "An Error<br>Goes Here.";
+ }
}
}
part {
@@ -199,7 +214,7 @@
color3: 255 255 255 128;
text {
text: "OK";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 10;
min: 0 0;
align: 0.5 0.5;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_menu.edc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- default_menu.edc 13 Apr 2005 15:52:32 -0000 1.9
+++ default_menu.edc 18 Sep 2005 06:27:47 -0000 1.10
@@ -594,7 +594,7 @@
color3: 255 255 255 128;
text {
text: "Item Label";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 10;
min: 1 1;
align: 0.0 0.5;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_move.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default_move.edc 3 May 2005 09:06:24 -0000 1.2
+++ default_move.edc 18 Sep 2005 06:27:47 -0000 1.3
@@ -87,7 +87,7 @@
color3: 255 255 255 128;
text {
text: "X Y";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 10;
align: 0.5 0.5;
min: 1 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_pager.edc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- default_pager.edc 6 Sep 2005 07:29:47 -0000 1.19
+++ default_pager.edc 18 Sep 2005 06:27:47 -0000 1.20
@@ -115,7 +115,7 @@
color3: 0 0 0 22;
text {
text: "Title goes here";
- font: "Edje Vera Bold";
+ font: "Edje-Vera-Bold";
size: 12;
min: 1 1;
align: 0.5 0.5;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_resize.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- default_resize.edc 31 Mar 2005 11:40:38 -0000 1.4
+++ default_resize.edc 18 Sep 2005 06:27:47 -0000 1.5
@@ -87,7 +87,7 @@
color3: 255 255 255 128;
text {
text: "WIDTHxHEIGHT";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 10;
align: 0.5 0.5;
min: 1 1;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/data/themes/default_temperature.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default_temperature.edc 10 Jan 2005 22:33:53 -0000 1.2
+++ default_temperature.edc 18 Sep 2005 06:27:47 -0000 1.3
@@ -86,7 +86,7 @@
color3: 0 0 0 32;
text {
text: "99^C";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 7;
min: 1 1;
align: 0.0 0.0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_winlist.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- default_winlist.edc 16 Jun 2005 02:41:48 -0000 1.6
+++ default_winlist.edc 18 Sep 2005 06:27:47 -0000 1.7
@@ -180,7 +180,7 @@
color3: 0 0 0 22;
text {
text: "Title goes here";
- font: "Edje Vera Bold";
+ font: "Edje-Vera-Bold";
size: 10;
min: 0 1;
align: 0.5 0.0;
@@ -226,7 +226,7 @@
color3: 0 0 0 22;
text {
text: "Title goes here";
- font: "Edje Vera Bold";
+ font: "Edje-Vera-Bold";
size: 10;
min: 0 1;
align: 0.0 0.5;
@@ -525,7 +525,7 @@
color3: 255 255 255 128;
text {
text: "Item Label";
- font: "Edje Vera";
+ font: "Edje-Vera";
size: 10;
min: 0 1;
align: 0.0 0.5;
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
