Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/data/themes/default/programs
Modified Files:
core.edc navigation_buttons.edc right_side.edc
Added Files:
info_bar.edc
Removed Files:
filename_bar.edc
Log Message:
* Improve the look of the navigation buttons of the default theme
===================================================================
RCS file: /cvs/e/e17/apps/eclair/data/themes/default/programs/core.edc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- core.edc 30 Aug 2005 23:09:39 -0000 1.7
+++ core.edc 30 Apr 2006 14:59:42 -0000 1.8
@@ -4,7 +4,7 @@
source: "";
script {
run_program(PROGRAM:"open_playlist");
- run_program(PROGRAM:"filename_scroll_right");
+ run_program(PROGRAM:"info_scroll_right");
}
}
//TODO: edje bug
@@ -19,11 +19,12 @@
source: "eclair_bin";
action: STATE_SET "play" 0.0;
transition: LINEAR 0.25;
- target: "button_play";
- target: "button_pause";
+ /*target: "button_play";
+ target: "button_pause";*/
target: "progress_bar_drag";
+ target: "progress_bar_drag_thumb";
}
-program {
+/*program {
name: "pause";
signal: "signal_pause";
source: "eclair_bin";
@@ -31,16 +32,17 @@
transition: LINEAR 0.25;
target: "button_play";
target: "button_pause";
-}
+}*/
program {
name: "stop";
signal: "signal_stop";
source: "eclair_bin";
action: STATE_SET "stop" 0.0;
transition: LINEAR 0.25;
- target: "button_play";
- target: "button_pause";
+ /*target: "button_play";
+ target: "button_pause";*/
target: "progress_bar_drag";
+ target: "progress_bar_drag_thumb";
}
program {
name: "cover_set";
===================================================================
RCS file:
/cvs/e/e17/apps/eclair/data/themes/default/programs/navigation_buttons.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- navigation_buttons.edc 21 May 2005 12:55:23 -0000 1.2
+++ navigation_buttons.edc 30 Apr 2006 14:59:42 -0000 1.3
@@ -1,216 +1,47 @@
-program {
- name: "button_play_in";
- signal: "mouse,in";
- source: "button_play";
- action: STATE_SET "over" 0.0;
- transition: LINEAR 0.25;
- target: "play_pause_clip";
-}
-program {
- name: "button_play_out";
- signal: "mouse,out";
- source: "button_play";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
- target: "play_pause_clip";
-}
-program {
- name: "button_play_clicked";
- signal: "mouse,clicked,1";
- source: "button_play";
- action: SIGNAL_EMIT "eclair_play" "";
-}
-program {
- name: "button_play_down";
- signal: "mouse,down,1";
- source: "button_play";
- action: STATE_SET "down" 0.0;
- target: "button_play";
-}
-program {
- name: "button_play_up";
- signal: "mouse,up,1";
- source: "button_play";
- action: STATE_SET "default" 0.0;
- target: "button_play";
-}
-program {
- name: "button_pause_in";
- signal: "mouse,in";
- source: "button_pause";
- action: STATE_SET "over" 0.0;
- transition: LINEAR 0.25;
- target: "play_pause_clip";
-}
-program {
- name: "button_pause_out";
- signal: "mouse,out";
- source: "button_pause";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
- target: "play_pause_clip";
-}
-program {
- name: "button_pause_clicked";
- signal: "mouse,clicked,1";
- source: "button_pause";
- action: SIGNAL_EMIT "eclair_pause" "";
-}
-program {
- name: "button_pause_down";
- signal: "mouse,down,1";
- source: "button_pause";
- action: STATE_SET "down" 0.0;
- target: "button_pause";
-}
-program {
- name: "button_pause_up";
- signal: "mouse,up,1";
- source: "button_pause";
- action: STATE_SET "play" 0.0;
- target: "button_pause";
-}
-program {
- name: "button_open_in";
- signal: "mouse,in";
- source: "button_open";
- action: STATE_SET "over" 0.0;
- transition: LINEAR 0.25;
- target: "button_open";
-}
-program {
- name: "button_open_out";
- signal: "mouse,out";
- source: "button_open";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
- target: "button_open";
-}
-program {
- name: "button_open_down";
- signal: "mouse,down,1";
- source: "button_open";
- action: STATE_SET "down" 0.0;
- target: "button_open";
-}
-program {
- name: "button_open_up";
- signal: "mouse,up,1";
- source: "button_open";
- action: STATE_SET "over" 0.0;
- target: "button_open";
-}
-program {
- name: "button_open_clicked";
- signal: "mouse,clicked,1";
- source: "button_open";
- action: SIGNAL_EMIT "eclair_open" "";
-}
-program {
- name: "button_stop_in";
- signal: "mouse,in";
- source: "button_stop";
- action: STATE_SET "over" 0.0;
- transition: LINEAR 0.25;
- target: "button_stop";
-}
-program {
- name: "button_stop_out";
- signal: "mouse,out";
- source: "button_stop";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
- target: "button_stop";
-}
-program {
- name: "button_stop_down";
- signal: "mouse,down,1";
- source: "button_stop";
- action: STATE_SET "down" 0.0;
- target: "button_stop";
-}
-program {
- name: "button_stop_up";
- signal: "mouse,up,1";
- source: "button_stop";
- action: STATE_SET "over" 0.0;
- target: "button_stop";
-}
-program {
- name: "button_stop_clicked";
- signal: "mouse,clicked,1";
- source: "button_stop";
- action: SIGNAL_EMIT "eclair_stop" "";
-}
-program {
- name: "button_prev_in";
- signal: "mouse,in";
- source: "button_prev";
- action: STATE_SET "over" 0.0;
- transition: LINEAR 0.25;
- target: "button_prev";
-}
-program {
- name: "button_prev_out";
- signal: "mouse,out";
- source: "button_prev";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
- target: "button_prev";
-}
-program {
- name: "button_prev_down";
- signal: "mouse,down,1";
- source: "button_prev";
- action: STATE_SET "down" 0.0;
- target: "button_prev";
-}
-program {
- name: "button_prev_up";
- signal: "mouse,up,1";
- source: "button_prev";
- action: STATE_SET "over" 0.0;
- target: "button_prev";
-}
-program {
- name: "button_prev_clicked";
- signal: "mouse,clicked,1";
- source: "button_prev";
- action: SIGNAL_EMIT "eclair_prev" "";
-}
-program {
- name: "button_next_in";
- signal: "mouse,in";
- source: "button_next";
- action: STATE_SET "over" 0.0;
- transition: LINEAR 0.25;
- target: "button_next";
-}
-program {
- name: "button_next_out";
- signal: "mouse,out";
- source: "button_next";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
- target: "button_next";
-}
-program {
- name: "button_next_down";
- signal: "mouse,down,1";
- source: "button_next";
- action: STATE_SET "down" 0.0;
- target: "button_next";
-}
-program {
- name: "button_next_up";
- signal: "mouse,up,1";
- source: "button_next";
- action: STATE_SET "over" 0.0;
- target: "button_next";
-}
-program {
- name: "button_next_clicked";
- signal: "mouse,clicked,1";
- source: "button_next";
- action: SIGNAL_EMIT "eclair_next" "";
-}
+#define BUTTON_NAV_PROG(button_name, action_signal) \
+program { \
+ name: "button_"button_name"_in"; \
+ signal: "mouse,in"; \
+ source: "button_"button_name"_rect"; \
+ action: STATE_SET "over" 0.0; \
+ transition: LINEAR 0.25; \
+ target: "button_"button_name"_icon"; \
+ target: "button_"button_name"_bg"; \
+} \
+program { \
+ name: "button_"button_name"_out"; \
+ signal: "mouse,out"; \
+ source: "button_"button_name"_rect"; \
+ action: STATE_SET "default" 0.0; \
+ transition: LINEAR 0.25; \
+ target: "button_"button_name"_icon"; \
+ target: "button_"button_name"_bg"; \
+} \
+program { \
+ name: "button_"button_name"_down"; \
+ signal: "mouse,down,1*"; \
+ source: "button_"button_name"_rect"; \
+ action: STATE_SET "down" 0.0; \
+ target: "button_"button_name"_icon"; \
+ target: "button_"button_name"_shadow"; \
+} \
+program { \
+ name: "button_"button_name"_up"; \
+ signal: "mouse,up,1"; \
+ source: "button_"button_name"_rect"; \
+ action: STATE_SET "default" 0.0; \
+ target: "button_"button_name"_icon"; \
+ target: "button_"button_name"_shadow"; \
+} \
+program { \
+ name: "button_"button_name"_clicked"; \
+ signal: "mouse,clicked,1"; \
+ source: "button_"button_name"_rect"; \
+ action: SIGNAL_EMIT action_signal ""; \
+}
+
+BUTTON_NAV_PROG("play", "eclair_play");
+BUTTON_NAV_PROG("stop", "eclair_stop");
+BUTTON_NAV_PROG("prev", "eclair_prev");
+BUTTON_NAV_PROG("next", "eclair_next");
+BUTTON_NAV_PROG("open", "eclair_open");
===================================================================
RCS file: /cvs/e/e17/apps/eclair/data/themes/default/programs/right_side.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- right_side.edc 3 May 2005 20:36:33 -0000 1.2
+++ right_side.edc 30 Apr 2006 14:59:42 -0000 1.3
@@ -1,4 +1,4 @@
-/*program {
+program {
name: "open_right_side";
signal: "mouse,clicked,1";
source: "right_border";
@@ -20,4 +20,3 @@
target: "right_side";
target: "right_shadow";
}
-*/
-------------------------------------------------------
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
