Merge branch 'upstream'

Author: simotek

enlightenment-elementary/edc/comp.edc

@@ -38,6 +38,7 @@ group { name: "e/comp/screen/base/default";
 
 group { name: "e/comp/screen/overlay/default";
    images.image: "screen_circular_shadow.png" COMP;
+   data.item: "restarted" "on";
    parts {
       part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -173,6 +174,26 @@ group { name: "e/comp/screen/overlay/default";
                 action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
             }
          }
+      program { signal: "e,state,sys,restart"; source: "e";
+         action: STATE_SET "visible" 0.0;
+         transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+         target: "suspender";
+         sequence {
+            action: SIGNAL_EMIT "e,state,sys,restart,done" "e";
+         }
+      }
+      program { signal: "e,state,sys,restarted"; source: "e";
+         action: STATE_SET "visible" 0.0;
+         target: "suspender";
+      }
+      program { signal: "e,state,sys,restarted,show"; source: "e";
+         action: STATE_SET "default" 0.0;
+         transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+         target: "suspender";
+         sequence {
+            action: SIGNAL_EMIT "e,state,sys,restarted,show,done" "e";
+         }
+      }
    }
 }
 

enlightenment-elementary/edc/elm/frame.edc

@@ -283,3 +283,54 @@ group { name: "elm/frame/base/outdent_bottom";
       }
    }
 }
+
+group { name: "elm/frame/base/outline";
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "bevel_out.png" COMP;
+      parts {
+         part { name: "shadow"; mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.offset: -1 0;
+               rel2.offset: 0 1;
+               image.normal: "shadow_square_tiny.png";
+               image.border: 6 6 6 6;
+               fill.smooth: 0;
+            }
+         }
+         part { name: "base"; type: RECT;
+            description { state: "default" 0.0;
+               rel1.offset: 3 0;
+               rel2.offset: -3 -3;
+               color: 64 64 64 255;
+            }
+         }
+         part { name: "clip"; type: RECT;
+            description { state: "default" 0.0;
+               rel1.offset: 5 0;
+               rel2.offset: -7 -7;
+            }
+         }
+         part { name: "elm.swallow.content"; type: SWALLOW;
+            clip_to: "clip";
+            description { state: "default" 0.0;
+               align: 0.0 1.0;
+               rel1.offset: 5 5;
+               rel2.offset: -5 -5;
+            }
+            description { state: "collapsed" 0.0;
+              inherit: "default" 0.0;
+              minmul: 1.0 0.0;
+            }
+         }
+         part { name: "bevel"; mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.offset: 2 2;
+               rel2.offset: -3 -3;
+               image.normal: "bevel_out.png";
+               image.border: 1 1 1 1;
+               image.middle: 0;
+               fill.smooth: 0;
+            }
+         }
+      }
+}