devilhorns pushed a commit to branch master.

http://git.enlightenment.org/apps/express.git/commit/?id=13ca55f4b4a64db9cb22f30594bb81cd04930177

commit 13ca55f4b4a64db9cb22f30594bb81cd04930177
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Wed Aug 12 16:00:48 2015 -0400

    express: Add popmedia controls to default theme
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 data/themes/default.edc | 284 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 282 insertions(+), 2 deletions(-)

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 6fd64ee..4c43cb6 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -2007,7 +2007,229 @@ collections
                }
 
              /* TODO: bell */
-             /* TODO: popmedia */
+
+             part
+               {
+                  name: "popmedia_clip";
+                  type: RECT;
+                  mouse_events: 1;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       visible: 0;
+                       color: 255 255 255 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                       color: 255 255 255 255;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_shadow";
+                  mouse_events: 0;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       rel1.to: "express.popmedia";
+                       rel2.to: "express.popmedia";
+                       image
+                         {
+                            normal: "pm_shadow.png";
+                            border: 64 64 64 64;
+                            border_scale_by: 0.1;
+                         }
+                       fill.smooth: 0;
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                       rel1.offset: -32 -32;
+                       rel2.offset: 31 31;
+                       image.border_scale_by: 1.0;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_fill";
+                  mouse_events: 0;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       rel1.to: "express.popmedia";
+                       rel2.to: "express.popmedia";
+                       image.normal: "pm_fill.png";
+                       fill
+                         {
+                            size.relative: 0.0 0.0;
+                            size.offset: 64 64;
+                         }
+                    }
+               }
+             part
+               {
+                  name: "express.popmedia";
+                  type: SWALLOW;
+                  clip_to: "popmedia_clip";
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       rel1.relative: 0.5 0.5;
+                       rel2.relative: 0.5 0.5;
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       rel1.relative: 0.1 0.1;
+                       rel2.relative: 0.9 0.9;
+                       visible: 1;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_overlay";
+                  mouse_events: 0;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       rel1.to: "express.popmedia";
+                       rel2.to: "express.popmedia";
+                       image.normal: "pm_overlay.png";
+                       fill.smooth: 0;
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_bevel";
+                  mouse_events: 0;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       rel1.to: "express.popmedia";
+                       rel2.to: "express.popmedia";
+                       image.normal: "bg_bevel.png";
+                       image.border: 3 3 3 3;
+                       image.middle: 0;
+                       fill.smooth: 0;
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_glintclip";
+                  type: RECT;
+                  mouse_events: 0;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_glint";
+                  mouse_events: 0;
+                  clip_to: "popmedia_glintclip";
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       min: 79 5;
+                       max: 79 5;
+                       rel1.to: "express.popmedia";
+                       rel2
+                         {
+                            relative: 1.0 0.0;
+                            offset: -1 0;
+                            to: "express.popmedia";
+                         }
+                       image.normal: "bg_glint.png";
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_shine";
+                  mouse_events: 0;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       rel1.to: "express.popmedia";
+                       rel2.to: "express.popmedia";
+                       image.normal: "bg_shine.png";
+                       fill.smooth: 0;
+                       align: 0.5 0.0;
+                       aspect: (256 / 120) (256 / 120);
+                       aspect_preference: HORIZONTAL;
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                    }
+               }
+             part
+               {
+                  name: "popmedia_dismiss";
+                  type: RECT;
+                  mouse_events: 1;
+                  description
+                    {
+                       state: "default" 0.0;
+                       fixed: 1 1;
+                       color: 0 0 0 0;
+                       visible: 0;
+                    }
+                  description
+                    {
+                       state: "visible" 0.0;
+                       inherit: "default" 0.0;
+                       visible: 1;
+                    }
+               }
           }
         programs
           {
@@ -2225,12 +2447,70 @@ collections
                   target: "tab_bevel_shad4";
                   target: "tabtitle";
                }
+             program
+               {
+                  signal: "mouse,clicked,*";
+                  source: "popmedia_dismiss";
+                  action: STATE_SET "default" 0.0;
+                  transition: DECELERATE 0.5;
+                  target: "express.popmedia";
+                  target: "popmedia_clip";
+                  target: "popmedia_dismiss";
+                  target: "popmedia_shadow";
+                  target: "popmedia_fill";
+                  target: "popmedia_overlay";
+                  target: "popmedia_bevel";
+                  target: "popmedia_glint";
+                  target: "popmedia_glintclip";
+                  target: "popmedia_shine";
+                  after: "popmedia_dismiss2";
+               }
+             program
+               {
+                  name: "popmedia_dismiss2";
+                  action: SIGNAL_EMIT "popmedia,done" "express";
+               }
+             program
+               {
+                  signal: "popmedia,off";
+                  source: "express";
+                  action: STATE_SET "default" 0.0;
+                  transition: DECELERATE 0.2;
+                  target: "express.popmedia";
+                  target: "popmedia_clip";
+                  target: "popmedia_dismiss";
+                  target: "popmedia_shadow";
+                  target: "popmedia_fill";
+                  target: "popmedia_overlay";
+                  target: "popmedia_bevel";
+                  target: "popmedia_glint";
+                  target: "popmedia_glintclip";
+                  target: "popmedia_shine";
+                  after: "popmedia_dismiss2";
+               }
+             program
+               {
+                  signal: "popmedia,on";
+                  source: "express";
+                  action: STATE_SET "visible" 0.0;
+                  transition: DECELERATE 0.2;
+                  target: "express.popmedia";
+                  target: "popmedia_clip";
+                  target: "popmedia_dismiss";
+                  target: "popmedia_shadow";
+                  target: "popmedia_fill";
+                  target: "popmedia_overlay";
+                  target: "popmedia_bevel";
+                  target: "popmedia_glint";
+                  target: "popmedia_glintclip";
+                  target: "popmedia_shine";
+               }
           }
      }
 
    group
      {
-         name: "express/tabbar_back";
+        name: "express/tabbar_back";
         images
           {
              image: "tab_base_l1.png" COMP;

-- 


Reply via email to