Enlightenment CVS committal
Author : boykot
Project : misc
Module : eplayer
Dir : misc/eplayer/data/themes/iio/programs
Modified Files:
controls.edc mini_controls.edc
Log Message:
Updating IIO to use the new signals.
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/data/themes/iio/programs/controls.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- controls.edc 1 Feb 2004 04:42:36 -0000 1.1
+++ controls.edc 8 Feb 2004 12:30:20 -0000 1.2
@@ -1,5 +1,10 @@
-/* switch mode */
+
+#define PLAYBACK_STATE_PLAYING PB_STARTED
+#define PLAYBACK_STATE_STOPPED PB_STOPPED
+#define PLAYBACK_STATE_PAUSED PB_PAUSED
+
+/* switch:stance */
program {
name, "_switch_mode_hilited";
@@ -102,28 +107,67 @@
action, SIGNAL_EMIT "RAISE", "base";
}
- program {
- name, "layer_animate";
- signal, "";
- //signal, "mouse,wheel,0,-1";
- source, "layer_in";
- action, STATE_SET "default" 1.0;
- transition, ACCELERATE 1.0;
- target, "layer_in";
- after, "aa";
- target, "quit";
+ program {
+ name, "pb_started";
+ signal, "PLAYBACK_STATE_PLAYING";
+ source, "*";
+ action, STATE_SET "default" 1.0;
+ transition, ACCELERATE 0.1;
+ target, "layer_in";
+ after, "aa";
+ target, "quit";
}
- program {
- name, "layer_deanimate";
- signal, "mouse,clicked,1";
- source, "layer_in";
- action, STATE_SET "default" 0.0;
- transition, DECELERATE 1.0;
- target, "layer_in";
- target, "a_a";
- target, "quit";
- }
+ program {
+ name, "pb_paused";
+ signal, "PLAYBACK_STATE_PAUSED";
+ source, "*";
+ action, STATE_SET "default" 1.0;
+ transition, ACCELERATE 1.0;
+ target, "layer_in";
+ after, "a_a_stop";
+ target, "quit";
+ }
+
+ program {
+ name, "pb_stopped";
+ signal, "PLAYBACK_STATE_STOPPED";
+ source, "*";
+ action, STATE_SET "default" 0.0;
+ transition, DECELERATE 0.1;
+ target, "layer_in";
+ target, "a_a";
+ target, "quit";
+ }
+
+ program {
+ name, "aa";
+ signal, "mouse,click,1";
+ source, "play_button";
+ action, STATE_SET "default" 1.0;
+ transition, LINEAR, 1.5;
+ target, "a_a";
+ after, "aa";
+ }
+
+ program {
+ name, "aa_paused";
+ signal, "mouse,click,1";
+ source, "paused_button";
+ action, STATE_SET "default" 1.0;
+ transition, LINEAR, 1.5;
+ target, "a_a_paused";
+ after, "aa_paused";
+ }
+
+ program {
+ name, "a_a_stop";
+ //signal, "mouse,click,2";
+ signal, "mouse,clicked,2";
+ source, "a_a";
+ action, ACTION_STOP;
+ target, "aa";
+ }
/* play_button */
@@ -168,27 +212,8 @@
signal, "mouse,down,1";
source, "play_button";
action, SIGNAL_EMIT "PLAY"
"play_button";
- after, "layer_animate";
}
- program {
- name, "aa";
- signal, "mouse,click,1";
- source, "play_button";
- action, STATE_SET "default" 1.0;
- transition, LINEAR, 1.5;
- target, "a_a";
- after, "aa";
- }
-
- program {
- name, "a_a_stop";
- //signal, "mouse,click,2";
- signal, "mouse,clicked,2";
- source, "a_a";
- action, ACTION_STOP;
- target, "aa";
- }
/* previous_button */
@@ -413,7 +438,6 @@
signal, "mouse,down,1";
source, "stop_button";
action, SIGNAL_EMIT "STOP"
"stop_button";
- after, "layer_deanimate";
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/misc/eplayer/data/themes/iio/programs/mini_controls.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mini_controls.edc 1 Feb 2004 04:42:36 -0000 1.1
+++ mini_controls.edc 8 Feb 2004 12:30:20 -0000 1.2
@@ -95,7 +95,6 @@
signal, "mouse,down,1";
source, "_play_button";
action, SIGNAL_EMIT "PLAY"
"play_button";
- after, "mode_animation";
}
/* previous_button */
@@ -280,9 +279,37 @@
}
program {
+ name, "mpb_started";
+ signal, "PLAYBACK_STATE_PLAYING";
+ source, "*";
+ action, STATE_SET "default" 0.0;
+ transition, DECELERATE 5.0;
+ target, "count";
+ after, "mode_animation";
+ }
+
+ program {
+ name, "mpb_paused";
+ signal, "PLAYBACK_STATE_PAUSED";
+ source, "*";
+ action, STATE_SET "default" 1.0;
+ transition, DECELERATE 0.5;
+ target, "count";
+ }
+
+ program {
+ name, "mpb_stopped";
+ signal, "PLAYBACK_STATE_STOPPED";
+ source, "*";
+ action, STATE_SET "default" 1.0;
+ transition, DECELERATE 0.5;
+ target, "count";
+ }
+
+ program {
name, "mode_animation";
signal, "mouse,click,1";
- source, "*";
+ source, "play_button";
action, STATE_SET "default" 0.0;
transition, DECELERATE, 5.0;
target, "count";
@@ -292,11 +319,12 @@
program {
name, "mode_animation_stop";
signal, "mouse,clicked,2";
- source, "*";
+ source, "stop_button";
action, ACTION_STOP;
target, "mode_animation";
}
+
/* Quit */
program {
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
