From: <enl...@li...> - 2004-03-02 21:31:27
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/default/programs Modified Files: tooltip.edc Log Message: use macros =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/programs/tooltip.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- tooltip.edc 9 Jan 2004 07:05:25 -0000 1.1 +++ tooltip.edc 2 Mar 2004 21:11:33 -0000 1.2 @@ -1,168 +1,50 @@ - /* ToolTips */ - program - { - name, "ToolTipKillCBS"; - signal, "mouse,in"; - source, "Button*"; - action, ACTION_STOP "ToolTipCB*"; - } - program - { - name, "ToolTipHide"; - signal, "mouse,in"; - source, "EnticeImage"; - action, STATE_SET "default" 0.0; + program { + name, "ToolTipHide"; + signal, ""; + source, ""; + action, STATE_SET "default" 0.0; + transition, DECELERATE 1.5; + target, "EnticeToolTipClip"; in, 1.0 0.0; + } + program { + name, "ToolTipShow"; + signal, ""; + source, ""; + action, STATE_SET "visible" 0.0; + transition, DECELERATE 1.5; target, "EnticeToolTipClip"; - transition, LINEAR 1.5; - in, 1.5 0.0; - } - program - { - name, "ToolTipShow"; - signal, ""; - source, ""; - action, STATE_SET "visible" 0.0; - target, "EnticeToolTipClip"; - transition, SINUSOIDAL 0.5; - after, "ToolTipHide"; - } - program - { - name, "ToolTipCBDelete"; - signal, "mouse,in"; - source, "ButtonDeleteImage"; - action, STATE_SET "delete_image" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBNext"; - signal, "mouse,in"; - source, "ButtonNextImage"; - action, STATE_SET "next_image" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBPrev"; - signal, "mouse,in"; - source, "ButtonPrevImage"; - action, STATE_SET "prev_image" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBRotateR"; - signal, "mouse,in"; - source, "ButtonRotateRight"; - action, STATE_SET "rotate_right" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBRotateL"; - signal, "mouse,in"; - source, "ButtonRotateLeft"; - action, STATE_SET "rotate_left" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBSlideShowGo"; - signal, "mouse,in"; - source, "ButtonSlideShowStart"; - action, STATE_SET "slideshow_start" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBSlideShowStop"; - signal, "mouse,in"; - source, "ButtonSlideShowStop"; - action, STATE_SET "slideshow_stop" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBZoomNormal"; - signal, "mouse,in"; - source, "ButtonZoomNormal"; - action, STATE_SET "zoom_normal" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBZoomIn"; - signal, "mouse,in"; - source, "ButtonZoomIn"; - action, STATE_SET "zoom_in" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBZoomOut"; - signal, "mouse,in"; - source, "ButtonZoomOut"; - action, STATE_SET "zoom_out" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBExpand"; - signal, "mouse,in"; - source, "ButtonExpandImage"; - action, STATE_SET "expand_image" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBFullScreen"; - signal, "mouse,in"; - source, "ButtonFullScreen"; - action, STATE_SET "full_screen" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBExit"; - signal, "mouse,in"; - source, "ButtonExit"; - action, STATE_SET "exit_entice" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } - program - { - name, "ToolTipCBSaveImage"; - signal, "mouse,in"; - source, "ButtonSaveImage"; - action, STATE_SET "save_image" 0.0; - target, "EnticeToolTip"; - in, 0.5 0.0; - after, "ToolTipShow"; - } + } +#define TOOLTIP_CB(pname, pstate) \ + program { name, "ToolTipKillCBS"pname; \ + signal, "mouse,in"; source, pname; \ + action, ACTION_STOP; target, "ToolTipHide"; } \ + program { name, "ToolTipClippy"pname; signal, "mouse,in"; \ + source, pname; action, STATE_SET "visible" 0.0; \ + transition, ACCELERATE 0.35; \ + target, "EnticeToolTipClip"; } \ + program { name, "ToolTip"pname; signal, "mouse,in"; \ + source, pname; action, STATE_SET pstate 0.0; \ + transition, ACCELERATE 0.25; in, 0.75 0.0; \ + target, "EnticeToolTip"; after, "ToolTipShow"; } \ + program { name, "ToolTipHide"pname; signal, "mouse,out"; \ + source, pname; action, ACTION_STOP; \ + target, "ToolTipHide"; \ + target, "ToolTip"pname; \ + target, "ToolTipKillCBS"pname; \ + after, "ToolTipHide"; } + + TOOLTIP_CB("ButtonDeleteImage", "delete_image") + TOOLTIP_CB("ButtonNextImage", "next_image") + TOOLTIP_CB("ButtonPrevImage", "prev_image") + TOOLTIP_CB("ButtonSaveImage", "save_image") + TOOLTIP_CB("ButtonRotateRight", "rotate_right") + TOOLTIP_CB("ButtonRotateLeft", "rotate_left") + TOOLTIP_CB("ButtonZoomNormal", "zoom_normal") + TOOLTIP_CB("ButtonZoomIn", "zoom_in") + TOOLTIP_CB("ButtonZoomOut", "zoom_out") + TOOLTIP_CB("ButtonExpandImage", "expand_image") + TOOLTIP_CB("ButtonFullScreen", "full_screen") + TOOLTIP_CB("ButtonExit", "exit_entice") + TOOLTIP_CB("ButtonSlideShowStart", "slideshow_start") + TOOLTIP_CB("ButtonSlideShowStop", "slideshow_stop") + |