we dont need no stinking screen.png...

SVN revision: 13773

data/themes/default_ibar.edc

@@ -23,13 +23,9 @@ group {
 	 description {
 	    state:    "default" 0.0;
 	    rel1 {
-	       relative: 0.0  0.0;
-	       offset:   0    0;
 	       to:       "overlay";
 	    }
 	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   -1;
 	       to:       "overlay";
 	    }
 	    image {
@@ -42,23 +38,7 @@ group {
 	 }
 	 description {
 	    state:    "vert" 0.0;
-	    rel1 {
+	    inherit:  "default" 0.0;
-	       relative: 0.0  0.0;
-	       offset:   0    0;
-	       to:       "overlay";
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   -1;
-	       to:       "overlay";
-	    }
-	    image {
-	       normal: "e17_ibar_bg_v.png";
-	       border: 6 6 6 6;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
 	 }
       }
       part {
@@ -69,12 +49,10 @@ group {
 	    state:    "default" 0.0;
 	    rel1 {
 	       to:       "background";
-	       relative: 0.0  0.0;
 	       offset:   4    4;
 	    }
 	    rel2 {
 	       to:       "background";
-	       relative: 1.0  1.0;
 	       offset:   -5    -5;
 	    }
 	    color: 255 255 255 255;
@@ -88,50 +66,24 @@ group {
 	 description {
 	    state:    "default" 0.0;
 	    rel1 {
-	       relative: 0.0  0.0;
 	       offset:   4    4;
 	    }
 	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -5    -1;
-	    }
-	    color: 0 0 0 0;
-	 }
-	 description {
-	    state:    "top" 0.0;
-	    rel1 {
-	       relative: 0.0  0.0;
-	       offset:   4    0;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
 	       offset:   -5    -5;
 	    }
 	    color: 0 0 0 0;
 	 }
+	 description {
+	    state:    "top" 0.0;
+	    inherit:  "default" 0.0;
+	 }
 	 description {
 	    state:    "left" 0.0;
-	    rel1 {
+	    inherit:  "default" 0.0;
-	       relative: 0.0  0.0;
-	       offset:   0    4;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -5  -5;
-	    }
-	    color: 0 0 0 0;
 	 }
 	 description {
 	    state:    "right" 0.0;
-	    rel1 {
+	    inherit:  "default" 0.0;
-	       relative: 0.0  0.0;
-	       offset:   4    4;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   -5;
-	    }
-	    color: 0 0 0 0;
 	 }
       }
       part {
@@ -139,14 +91,6 @@ group {
 	 mouse_events:  0;
 	 description {
 	    state:    "default" 0.0;
-	    rel1 {
-	       relative: 0.0  0.0;
-	       offset:   0    0;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   3;
-	    }
 	    image {
 	       normal: "e17_ibar_over_h.png";
 	       border: 13 13 13 13;
@@ -157,57 +101,15 @@ group {
 	 }
 	 description {
 	    state:    "top" 0.0;
-	    rel1 {
+	    inherit:  "default" 0.0;
-	       relative: 0.0  0.0;
-	       offset:   0    -4;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   -1;
-	    }
-	    image {
-	       normal: "e17_ibar_over_h.png";
-	       border: 13 13 13 13;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
 	 }
 	 description {
 	    state:    "left" 0.0;
-	    rel1 {
+	    inherit:  "default" 0.0;
-	       relative: 0.0  0.0;
-	       offset:   -4   0;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   -1;
-	    }
-	    image {
-	       normal: "e17_ibar_over_v.png";
-	       border: 13 13 13 13;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
 	 }
 	 description {
 	    state:    "right" 0.0;
-	    rel1 {
+	    inherit:  "default" 0.0;
-	       relative: 0.0  0.0;
-	       offset:   0    0;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   3    -1;
-	    }
-	    image {
-	       normal: "e17_ibar_over_v.png";
-	       border: 13 13 13 13;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
 	 }
       }
       part {
@@ -255,6 +157,7 @@ group {
       }
    }
 }
+
 group {
    name: "modules/ibar/follower";
    min: 56 56;
@@ -352,6 +255,7 @@ group {
       }
    }
 }
+
 group {
    name: "modules/ibar/icon";
    data {
@@ -378,6 +282,7 @@ group {
       }
    }
 }
+
 group {
    name: "modules/ibar/icon_overlay";
    data {

data/themes/default_pager.edc

@@ -3,25 +3,44 @@ images {
    image: "e17_pager_desk.png" COMP;
    image: "e17_pager_window.png" COMP;
 }
+
+// e17_ibar_over_h.png
+// e17_ibar_bg_h.png
+
 group {
-   name: "modules/pager/screen";
+   name: "modules/pager/main";
    parts {
       part {
 	 name:          "background";
-	 mouse_events:  0;
+	 mouse_events:  1;
-	 type:          RECT;
 	 description {
 	    state:    "default" 0.0;
-	    visible:  0;
-	    min:      18 18;
-	    max:      18 18;
 	    rel1 {
-	       relative: 0.0  0.0;
+	       to:       "overlay";
-	       offset:   0    0;
 	    }
 	    rel2 {
-	       relative: 1.0  1.0;
+	       to:       "overlay";
-	       offset:   -1   -1;
+	    }
+	    image {
+	       normal: "e17_ibar_bg_h.png";
+	       border: 6 6 6 6;
+	    }
+	    fill {
+	       smooth: 0;
+	    }
+	 }
+      }
+      part {
+	 name:          "items";
+	 mouse_events:  0;
+	 type:          SWALLOW;
+         description {
+	    state:    "default" 0.0;
+	    rel1 {
+	       offset:   4    4;
+	    }
+	    rel2 {
+	       offset:   -5    -5;
 	    }
 	    color: 0 0 0 0;
 	 }
@@ -31,22 +50,18 @@ group {
 	 mouse_events:  0;
 	 description {
 	    state:    "default" 0.0;
-	    rel1 {
-	       relative: 0.0  0.0;
-	       offset:   0    0;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   -1;
-	    }
 	    image {
-	       normal: "e17_pager_screen.png";
+	       normal: "e17_ibar_over_h.png";
-	       border: 7 7 7 7;
+	       border: 13 13 13 13;
+	    }
+	    fill {
+	       smooth: 0;
 	    }
 	 }
       }
    }
 }
+
 group {
    name: "modules/pager/desk";
    parts {
@@ -68,6 +83,21 @@ group {
 	    color: 0 0 0 0;
 	 }
       }
+      part {
+	 name:          "items";
+	 mouse_events:  0;
+	 type:          SWALLOW;
+         description {
+	    state:    "default" 0.0;
+	    rel1 {
+	       offset:   2    2;
+	    }
+	    rel2 {
+	       offset:   -3    -3;
+	    }
+	    color: 0 0 0 0;
+	 }
+      }
       part {
 	 name:          "overlay";
 	 mouse_events:  0;
@@ -75,11 +105,11 @@ group {
 	    state:    "default" 0.0;
 	    rel1 {
 	       relative: 0.0  0.0;
-	       offset:   0    0;
+	       offset:   1    1;
 	    }
 	    rel2 {
 	       relative: 1.0  1.0;
-	       offset:   -1   -1;
+	       offset:   -2   -2;
 	    }
 	    image {
 	       normal: "e17_pager_desk.png";
@@ -89,6 +119,7 @@ group {
       }
    }
 }
+
 group {
    name: "modules/pager/window";
    parts {

data/themes/images/Makefile.am

@@ -244,7 +244,6 @@ e17_battery_080.png \
 e17_battery_090.png \
 e17_battery_100.png \
 e17_battery_ac.png \
-e17_pager_screen.png \
 e17_pager_desk.png \
 e17_pager_window.png \
 e17_temperature_base.png \