From: <enl...@li...> - 2004-04-27 10:29:07
|
Enlightenment CVS committal Author : boykot Project : e17 Module : apps/entice Dir : e17/apps/entice/data/themes/artifakt/programs Modified Files: buttons.edc icons.edc panel.edc tool_panel.edc Log Message: Continue =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/artifakt/programs/buttons.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- buttons.edc 11 Apr 2004 22:57:53 -0000 1.1 +++ buttons.edc 27 Apr 2004 10:29:00 -0000 1.2 @@ -92,4 +92,3 @@ action, STATE_SET "clicked" 0.0; target, "buttonExit"; } - =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/artifakt/programs/icons.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- icons.edc 11 Apr 2004 22:57:53 -0000 1.1 +++ icons.edc 27 Apr 2004 10:29:00 -0000 1.2 @@ -1,52 +1,98 @@ -program { name, "IconScaleHilited"; signal, "mouse,in"; source, "IconScale"; - action, STATE_SET "active" 0.0; transition, SINUSOIDAL 1.05; - target, "IconScale"; after, "IconScaleHilited"; -} - -program { name, "IconScaleUnhilited"; signal, "mouse,out"; source, "IconScale"; - action, STATE_SET "default" 0.0; transition, SINUSOIDAL 0.45; - target, "IconScale"; -} - -program { name, "IconScaleExecute"; signal, "mouse,down,*"; source, "IconScale"; - action, SIGNAL_EMIT "entice,image,current,zoom,reset" ""; } - -program { name, "IconFitHilited"; signal, "mouse,in"; source, "IconFit"; - action, STATE_SET "active" 0.0; transition, SINUSOIDAL 1.05; - target, "IconFit"; after, "IconFitHilited"; -} - -program { name, "IconFitUnhilited"; signal, "mouse,out"; source, "IconFit"; - action, STATE_SET "default" 0.0; transition, SINUSOIDAL 0.05; - target, "IconFit"; -} - -program { name, "IconFitExecute"; signal, "mouse,down,*"; source, "IconFit"; - action, SIGNAL_EMIT "entice,image,current,zoom,fit" ""; } - -program { name, "IconZoomInHilited"; signal, "mouse,in"; source, "IconZoomIn"; - action, STATE_SET "active" 0.0; transition, SINUSOIDAL 1.05; - target, "IconZoomIn"; after, "IconZoomInHilited"; -} - -program { name, "IconZoomInUnhilited"; signal, "mouse,out"; source, "IconZoomIn"; - action, STATE_SET "default" 0.0; transition, SINUSOIDAL 0.05; - target, "IconZoomIn"; -} - -program { name, "IconZoomInExecute"; signal, "mouse,down,*"; source, "IconZoomIn"; - action, SIGNAL_EMIT "entice,image,current,zoom,in" ""; } - -program { name, "IconZoomOutHilited"; signal, "mouse,in"; source, "IconZoomOut"; - action, STATE_SET "active" 0.0; transition, LINEAR 0.95; - target, "IconZoomOut"; after, "IconZoomOutHilited"; -} - -program { name, "IconZoomInOuthilited"; signal, "mouse,out"; source, "IconZoomOut"; - action, STATE_SET "default" 0.0; transition, SINUSOIDAL 0.05; - target, "IconZoomOut"; -} - -program { name, "IconZoomInExecute"; signal, "mouse,down,*"; source, "IconZoomOut"; - action, SIGNAL_EMIT "entice,image,current,zoom,out" ""; } +p { n, SCALE"Hilited"; s, "mouse,in"; so, SCALE; + a, ST "active" x; tr, SINUSOIDAL 1.05; + t, SCALE; af, SCALE"Hilited"; } + +p { n, SCALE"Unhilited"; s, "mouse,out"; so, SCALE; + a, ST "default" x; tr, SINUSOIDAL 0.45; + t, SCALE; } + +p { n, SCALE"Execute"; s, "mouse,down,*"; so, SCALE; + a, SIGNAL_EMIT "entice,image,current,zoom,reset" ""; } + +p { n, SCALE"Clicked"; s, "mouse,down,*"; so, SCALE; + a, ST "clicked" x; tr, SINUSOIDAL x1; + t, SCALE; } + +p { n, SCALE"UnClicked"; s, "mouse,up,*"; so, SCALE; + a, ST "default" x; tr, SINUSOIDAL x1; + t, SCALE; } +// +p { n, FIT"Hilited"; s, "mouse,in"; so, FIT; + a, ST "active" x; transition, SINUSOIDAL 1.05; + t, FIT; after, FIT"Hilited"; } + +p { n, FIT"Unhilited"; signal, "mouse,out"; so, FIT; + a, ST "default" x; tr, SINUSOIDAL x5; + t, FIT; } + +p { n, FIT"Execute"; s, "mouse,down,*"; so, FIT; + a, SIGNAL_EMIT "entice,image,current,zoom,fit" ""; } + +p { n, FIT"Clicked"; s, "mouse,down,*"; so, FIT; + a, ST "clicked" x; tr, SINUSOIDAL x1; + t, FIT; } + +p { n, FIT"UnClicked"; s, "mouse,up,*"; so, FIT; + a, ST "default" x; tr, SINUSOIDAL x1; + t, FIT; } +// +p { n, ZoomIn"Hilited"; s, "mouse,in"; so, ZoomIn; + a, ST "active" x; tr, SINUSOIDAL 1.05; + t, ZoomIn; af, ZoomIn"Hilited"; } + +p { n, ZoomIn"Unhilited"; s, "mouse,out"; so, ZoomIn; + a, ST "default" x; tr, SINUSOIDAL x5; + t, ZoomIn; } + +p { n, ZoomIn"Execute"; s, "mouse,down,*"; so, ZoomIn; + a, SIGNAL_EMIT "entice,image,current,zoom,in" ""; } + +p { n, ZoomIn"Clicked"; signal, "mouse,down,*"; so, ZoomIn; + a, ST "clicked" x; tr, SINUSOIDAL x1; + t, ZoomIn; } + +p { n, ZoomIn"UnClicked"; s, "mouse,up,*"; so, ZoomIn; + a, ST "default" x; tr, SINUSOIDAL x1; + t, ZoomIn; } +// + +p { n, ZoomOut"Hilited"; s, "mouse,in"; so, ZoomOut; + a, ST "active" x; tr, LINEAR 0.95; + t, ZoomOut; af, ZoomOut"Hilited"; } + +p { n, ZoomOut"UnHilited"; s, "mouse,out"; so, ZoomOut; + a, ST "default" x; tr, SINUSOIDAL x5; + t, ZoomOut; } + +p { n, ZoomOut"Execute"; s, "mouse,down,*"; so, ZoomOut; + a, SIGNAL_EMIT "entice,image,current,zoom,out" ""; } + +p { n, ZoomOut"Clicked"; s, "mouse,down,*"; so, ZoomOut; + a, ST "clicked" x; tr, SINUSOIDAL x1; + t, ZoomOut; } + +p{ n, ZoomOut"UnClicked"; s, "mouse,up,*"; so, ZoomOut; + a, ST "default" x; tr, SINUSOIDAL x1; + t, ZoomOut; } + +// + +p { n, "FullScreenHilited"; s, "mouse,in"; so, "IconFullScreen"; + a, ST "active" x; tr, SINUSOIDAL 1.05; + t, "IconFullScreen"; af, "FullScreenHilited"; } + +p { n, "FullScreenUnHilited"; s, "mouse,out"; so, "IconFullScreen"; + a, ST "default" x; tr, SINUSOIDAL 0.45; + t, "IconFullScreen"; } + +p { n, "FullScreenExecute"; s, "mouse,clicked,*"; so, "IconFullScreen"; + a, SIGNAL_EMIT "entice,fullscreen" ""; } + +p { n, "FullScreenClicked"; s, "mouse,down,*"; so, "IconFullScreen"; + a, ST "clicked" x; tr, SINUSOIDAL x1; + t, "IconFullScreen"; } + +p { n, "FullScreenUnClicked"; s, "mouse,up,*"; so, "IconFullScreen"; + a, ST "default" x; tr, SINUSOIDAL x1; + t, "IconFullScreen"; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/artifakt/programs/panel.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- panel.edc 11 Apr 2004 22:57:53 -0000 1.1 +++ panel.edc 27 Apr 2004 10:29:00 -0000 1.2 @@ -1,15 +1,4 @@ -//////////////////////////// Load Panel/Restore (hide) buttons //////// -//program { name, "LoadPanel"; signal, "mouse,down,*"; source, "LoadLPanel"; -// action, STATE_SET "visible" 0.0; transition, LINEAR 0.45; -// target, "PanelClip"; in, 0.5 0.0; //after, "ThumbsOut"; -//} -// -//program { name, "RestorePanel"; signal, "mouse,down,*"; source, "HideLPanel"; -// action, STATE_SET "default" 0.0; transition, LINEAR 0.45; -// target, "PanelClip"; in, 0.5 0.0; //after, "ThumbsIn"; -//} -//////////////////////////// Load Panel/Hide w/ panel_mouse_area ////// program { name, "ShowPanel"; signal, "mouse,in"; source, "PanelMouseArea"; action, STATE_SET "visible" 0.0; transition, LINEAR 0.45; target, "PanelClip"; in, 0.5 0.0; @@ -19,22 +8,3 @@ action, STATE_SET "default" 0.0; transition, DECELERATE 0.75; target, "PanelClip"; in, 0.5 0.0; } -/////////////////////////////////////////////////////////////////////// -/* -program { name, "ThumbsOut"; signal, "mouse,in"; source, "PanelMouseArea"; - action, STATE_SET "default" 0.0; transition, ACCELERATE 0.75; - target, "entice.thumbnail.area"; -} - -program { name, "ThumbsIn"; signal, "mouse,out"; source, "PanelMouseArea"; - action, STATE_SET "hidden" 0.0; transition, LINEAR 1.10; - target, "entice.thumbnail.area"; -} */ -/////////////////////////////////////////////////////////////////////// -program { name, "MouseWheelUp"; signal, "mouse,wheel,0,-1"; source, "PanelMouseArea"; - action, SIGNAL_EMIT "entice,image,prev" ""; -} - -program { name, "MouseWheelDown"; signal, "mouse,wheel,0,1"; source, "PanelMouseArea"; - action, SIGNAL_EMIT "entice,image,next" ""; -} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/artifakt/programs/tool_panel.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- tool_panel.edc 11 Apr 2004 22:57:53 -0000 1.1 +++ tool_panel.edc 27 Apr 2004 10:29:00 -0000 1.2 @@ -1,10 +1,72 @@ -program { name, "ShowTPanel"; signal, "mouse,in"; source, "PanningClipMouseArea"; - action, STATE_SET "visible" 0.0; transition, DECELERATE 0.45; - target, "PanningClip"; in, 0.5 0.0; +p { n, "ScrollLeftDefault"; s, "mouse,up,1"; so, "ScrollLeft"; + a, STATE_SET "default" x; tr, SINUSOIDAL 0.25; + t, "ScrollLeft"; } -program { name, "HideTPanel"; signal, "mouse,in"; source, "entice.image"; - action, STATE_SET "default" 0.0; transition, DECELERATE 0.75; - target, "PanningClip"; in, 0.5 0.0; +p { n, "ScrollLeftPressed"; s, "mouse,down,1"; so, "ScrollLeft"; + a, STATE_SET "selected" x; tr, LINEAR x; + t, "ScrollLeft"; } + +p { n, "ThumbScrollLeftStop"; s, "mouse,up,1"; so, "ScrollLeft"; + a, SIGNAL_EMIT "entice,thumbnail,scroll,stop" ""; +} + +p { n, "ThumbScrollLeftStart"; s, "mouse,down,1"; so, "ScrollLeft"; + a, SIGNAL_EMIT "entice,thumbnail,scroll,start,next" ""; +} + +p { n, "ScrollLNextImage"; s, "mouse,up,1"; so, "ScrollLeft"; + a, SIGNAL_EMIT "entice,image,next" ""; +} + +p { n, "ScrollRightDefault"; s, "mouse,up,1"; so, "ScrollRight"; + a, ST "default" x; tr, SINUSOIDAL 0.25; + t, "ScrollRight"; +} + +p { n, "ScrollRightPressed"; s, "mouse,down,1"; so, "ScrollRight"; + a, ST "selected" x; tr, LINEAR x; + t, "ScrollRight"; +} + +p { n, "ThumbScrollRightStop"; s, "mouse,up,1"; so, "ScrollRight"; + a, SIGNAL_EMIT "entice,thumbnail,scroll,stop" ""; } + +p { n, "ThumbScrollRightStart"; s, "mouse,down,1"; so, "ScrollRight"; + a, SIGNAL_EMIT "entice,thumbnail,scroll,start,prev" ""; +} + +p { n, "ScrollRPrevImage"; s, "mouse,up,1"; so, "ScrollRight"; + a, SIGNAL_EMIT "entice,image,prev" ""; +} + +p { n, "Show.Thumbnail.area.Panel"; s, "mouse,in"; so, "PanningClipMouseArea"; + a, ST"visible" 0.0; tr, DECELERATE 0.50; + t, "ToolPanel"; in, 0.5 x; +} + +p { n, "Hide.Thumbnail.area.Panel"; s, "mouse,in"; so, "entice.image"; + a, ST "default" x; tr, DECELERATE x1; + t, "ToolPanel"; +} + +p { n, "ShowT"; s, "mouse,in"; so, "ToolPanel"; + a, STATE_SET "visible" x; tr, LINEAR 0.45; + t, "entice.thumbnail.area"; in, 0.75 x; +} + +p { n, "UnShowT"; s, "mouse,in"; so, "entice.image"; + a, STATE_SET "default" x; tr, LINEAR x1; + t, "entice.thumbnail.area"; +} + +p { n, "ShowFileAttrib"; s, "mouse,in"; so, "PanningClipMouseArea"; + a, ST "visible" x; tr, SINUSOIDAL 1.05; + t, "entice.image.current.filename.short"; + t, "entice.image.current.dimensions"; } +p { n, "HideFileAttrib"; s, "mouse,in"; so, "entice.image"; + a, ST "default" x; tr, SINUSOIDAL 1.05; + t, "entice.image.current.filename.short"; + t, "entice.image.current.dimensions"; } |