Enlightenment CVS committal
Author : pfritz
Project : e17
Module : apps/elitaire
Dir : e17/apps/elitaire/data/themes/e17
Modified Files:
e17.edc e17_macros.edc main.grp
Log Message:
some theme improvements (glow font);
some minor things
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/data/themes/e17/e17.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e17.edc 16 Jun 2007 09:01:25 -0000 1.3
+++ e17.edc 6 Jul 2007 23:58:32 -0000 1.4
@@ -238,7 +238,7 @@
SCROLL_UP_PART( _rel, 0.5, 0.6, _rel"_scroll_up_box")\
TOOLTIP( _rel"_bg_top", _name)
-#define BAR_PROGS( _sig, _flag, _rel , _var) \
+#define BAR_PROGS( _sig, _flag, _rel , _var, _event) \
program {\
name: _sig"_clicked";\
signal: "mouse,clicked,1";\
@@ -254,7 +254,34 @@
}\
}\
}\
+program {\
+ name: _event"_selected";\
+ signal: _event",selected";\
+ source: "elitaire";\
+ script {\
+ if(get_int(_var) == 1) {\
+ set_int(_var, 0);\
+ emit(_sig",off", "");\
+ }\
+ }\
+}\
\
+program {\
+ name: _sig"_on";\
+ signal: _sig",on";\
+ source: "";\
+ action: STATE_SET "visible" 0.0;\
+ target: _rel;\
+ transition: SINUSOIDAL 0.5;\
+}\
+program {\
+ name: _sig"_off";\
+ signal: _sig",off";\
+ source: "";\
+ action: STATE_SET "default" 0.0;\
+ target: _rel;\
+ transition: SINUSOIDAL 0.5;\
+}\
program {\
name: _rel"_mouse_wheel_up";\
signal: "mouse,wheel,0,-1";\
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/data/themes/e17/e17_macros.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e17_macros.edc 16 Jun 2007 09:01:25 -0000 1.2
+++ e17_macros.edc 6 Jul 2007 23:58:32 -0000 1.3
@@ -158,9 +158,12 @@
clip_to: _rel"_label_clip";\
mouse_events: 0;\
type: TEXT;\
+ effect: GLOW;\
description {\
state: "default" 0.0;\
color: 0 0 0 0;\
+ color2: 255 170 17 68;\
+ color3: 255 238 136 119;\
align: 0.0 0.0;\
visible: 0;\
rel1 {\
@@ -183,7 +186,9 @@
description {\
state: "on" 0.0;\
inherit: "default" 0.0;\
- color: 123 0 0 255;\
+ color: 255 255 255 255;\
+ color2: 255 170 17 170;\
+ color3: 255 238 136 119;\
visible: 1;\
}\
}\
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/data/themes/e17/main.grp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- main.grp 16 Jun 2007 09:01:25 -0000 1.2
+++ main.grp 6 Jul 2007 23:58:32 -0000 1.3
@@ -145,12 +145,14 @@
part {
name: "elitaire_win_text";
type: TEXT;
- effect: SHADOW;
+ effect: GLOW;
repeat_events: 1;
description {
state: "default" 0.0;
color: 0 0 0 0;
+ color2: 255 170 17 255;
+ color3: 255 238 136 119;
rel1 { relative: 0.5 0.5; offset: -2 -2; to:
"elitaire_card_field";}
rel2 { relative: 0.5 0.5; offset: 2 2; to:
"elitaire_card_field";}
text {
@@ -163,7 +165,10 @@
}
description {
state: "on" 0.0;
- color: 255 219 103 200;
+ color: 255 255 255 255;
+ color2: 255 170 17 255;
+ color3: 255 238 136 119;
+
rel1 { relative: 0.0 0.3; offset: 25 0; to:
"elitaire_card_field";}
rel2 { relative: 1.0 0.7; offset: -25 0; to:
"elitaire_card_field";}
text {
@@ -229,54 +234,6 @@
}
programs {
program {
- name: "menubar_on";
- signal: "menubar,on";
- source: "";
- action: STATE_SET "visible" 0.0;
- target: "menu_bar";
- transition: SINUSOIDAL 0.5;
- }
- program {
- name: "menubar_off";
- signal: "menubar,off";
- source: "";
- action: STATE_SET "default" 0.0;
- target: "menu_bar";
- transition: SINUSOIDAL 0.5;
- }
- program {
- name: "themebar_on";
- signal: "themebar,on";
- source: "";
- action: STATE_SET "visible" 0.0;
- target: "theme_bar";
- transition: SINUSOIDAL 0.5;
- }
- program {
- name: "themebar_off";
- signal: "themebar,off";
- source: "";
- action: STATE_SET "default" 0.0;
- target: "theme_bar";
- transition: SINUSOIDAL 0.5;
- }
- program {
- name: "cardbar_on";
- signal: "cardbar,on";
- source: "";
- action: STATE_SET "visible" 0.0;
- target: "card_bar";
- transition: SINUSOIDAL 0.5;
- }
- program {
- name: "cardbar_off";
- signal: "cardbar,off";
- source: "";
- action: STATE_SET "default" 0.0;
- target: "card_bar";
- transition: SINUSOIDAL 0.5;
- }
- program {
name: "win_on";
signal: "win,on";
source: "";
@@ -312,9 +269,9 @@
ICON_PROGS( "undo", "undo", "")
ICON_PROGS( "restart", "restart", "br")
ICON_PROGS( "newstart", "new_game", "")
- BAR_PROGS( "cardbar", "elitaire_cards_box", "card_bar",
cardbar_state)
- BAR_PROGS( "themebar", "elitaire_theme_box", "theme_bar",
themebar_state)
- BAR_PROGS( "menubar", "elitaire_new_box", "menu_bar",
menubar_state)
+ BAR_PROGS( "cardbar", "elitaire_cards_box", "card_bar",
cardbar_state, "cards")
+ BAR_PROGS( "themebar", "elitaire_theme_box", "theme_bar",
themebar_state, "theme")
+ BAR_PROGS( "menubar", "elitaire_new_box", "menu_bar",
menubar_state, "game")
}
}/*
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
