some not-so-arsetastic shelf gfx

SVN revision: 21402

diff --git a/data/themes/default_shelf.edc b/data/themes/default_shelf.edc
index f1057ef..fc9ec3d 100644 (file)
--- a/data/themes/default_shelf.edc
+++ b/data/themes/default_shelf.edc
@@ -1,10 +1,22 @@
 images {
-   image: "e17_menu_bg.png" COMP;
-   image: "e17_menu_bg_border.png" COMP;
+   image: "e17_shelf1.png" COMP;
+   image: "e17_shelf2.png" COMP;
+   image: "e17_shelf3.png" COMP;
+   image: "e17_shelf4.png" COMP;
+   image: "e17_shelf5.png" COMP;
+   image: "e17_shelf6.png" COMP;
+   image: "e17_shelf_bg1.png" COMP;
+   image: "e17_shelf_bg2.png" COMP;
+   image: "e17_shelf_sh1.png" COMP;
+   image: "e17_shelf_sh2.png" COMP;
 }
 
 group {
    name: "shelf/default/base";
+   data {
+      // this tells e the border is shaped
+      item: "shaped" "1";
+   }
    parts {
       part {
         name:          "base";
@@ -14,12 +26,13 @@ group {
            state:    "default" 0.0;
            rel1 {
               relative: 0.0  1.0;
-              offset:   1    0;
-              to_y:     "base2";
+              offset:   0    0;
+              to:       "base2";
            }
            rel2 {
+              to_x:       "base2";
               relative: 1.0  1.0;
-              offset:   -2   -2;
+              offset:   -1   -2;
            }
            color: 221 221 221 255;
         }
@@ -29,21 +42,23 @@ group {
         mouse_events:  0;
         description {
            state:    "default" 0.0;
-           max:      99999 48;
-           align:    0.5   0.0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   1    1;
+              offset:   32   0;
            }
            rel2 {
-              relative: 1.0  1.0;
-              offset:   -2   -2;
+              relative: 1.0  0.0;
+              offset:   -33   19;
            }
            image {
-              normal: "e17_menu_bg.png";
+              normal: "e17_shelf_bg1.png";
            }
            fill {
               smooth: 0;
+               size {
+                  relative: 1.0 0;
+                  offset: 0 20;
+              }
            }
         }
       }
@@ -52,18 +67,19 @@ group {
         mouse_events:  0;
         description {
            state:    "default" 0.0;
+           max:      99999 20;
            rel1 {
-              relative: 0.0  0.0;
-              offset:   0    0;
+              to_x: "base2";
+              relative: 0.0  1.0;
+              offset:   0   -1;
            }
            rel2 {
+              to_x: "base2";
               relative: 1.0  1.0;
               offset:   -1   -1;
            }
            image {
-              normal: "e17_menu_bg_border.png";
-              border: 1 1 1 1;
-              middle: 0;
+              normal: "e17_shelf_bg2.png";
            }
            fill {
               smooth: 0;
@@ -78,97 +94,156 @@ group {
            state:    "default" 0.0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   2    2;
+              offset:   32   2;
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -33   -3;
            }
         }
       }
       part {
-        name:          "drag";
-        mouse_events:  1;
-        type:          RECT;
+        name:          "sh1";
+        mouse_events:  0;
         description {
            state:    "default" 0.0;
            rel1 {
+              to_x: "base2";
+              relative: 0.0  0.0;
+              offset:   0    0;
+           }
+           rel2 {
+              to_x: "base2";
               relative: 0.0  1.0;
-              offset:   5    -5;
+              offset:   9   -1;
+           }
+           image {
+              normal: "e17_shelf_sh1.png";
+           }
+        }
+      }
+      part {
+        name:          "sh2";
+        mouse_events:  0;
+        description {
+           state:    "default" 0.0;
+           rel1 {
+              to_x: "base2";
+              relative: 1.0  0.0;
+              offset:   -10  0;
            }
            rel2 {
+              to_x: "base2";
               relative: 1.0  1.0;
-              offset:   -6   -3;
+              offset:   -1  -1;
+           }
+           image {
+              normal: "e17_shelf_sh2.png";
            }
-           color: 0 255 0 100;
         }
       }
       part {
         name:          "resize_l";
-        mouse_events:  1;
-        type:          RECT;
         description {
            state:    "default" 0.0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   2    2;
+              offset:   0  0;
+           }
+           rel2 {
+              relative: 0.0  0.0;
+              offset:   31  9;
+           }
+           image {
+              normal: "e17_shelf1.png";
+           }
+        }
+      }
+      part {
+        name:          "drag1";
+        description {
+           state:    "default" 0.0;
+           rel1 {
+              relative: 0.0  0.0;
+              offset:   0  10;
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   4    -6;
+              offset:   31  -11;
+           }
+           image {
+              normal: "e17_shelf2.png";
+              border: 4 4 4 4;
+           }
+        }
+      }
+      part {
+        name:          "resize_b1";
+        description {
+           state:    "default" 0.0;
+           rel1 {
+              relative: 0.0  1.0;
+              offset:   0  -10;
+           }
+           rel2 {
+              relative: 0.0  1.0;
+              offset:   31  -1;
+           }
+           image {
+              normal: "e17_shelf3.png";
            }
-           color: 0 0 255 100;
         }
       }
       part {
         name:          "resize_r";
-        mouse_events:  1;
-        type:          RECT;
         description {
            state:    "default" 0.0;
            rel1 {
               relative: 1.0  0.0;
-              offset:   -5   2;
+              offset:   -32  0;
            }
            rel2 {
-              relative: 1.0  1.0;
-              offset:   -3   -6;
+              relative: 1.0  0.0;
+              offset:   -1  9;
+           }
+           image {
+              normal: "e17_shelf4.png";
            }
-           color: 0 0 255 100;
         }
       }
       part {
-        name:          "resize_b";
-        mouse_events:  1;
-        type:          RECT;
+        name:          "drag2";
         description {
            state:    "default" 0.0;
            rel1 {
-              relative: 0.0  1.0;
-              offset:   2    -5;
+              relative: 1.0  0.0;
+              offset:   -32  10;
            }
            rel2 {
-              relative: 0.0  1.0;
-              offset:   4    -3;
+              relative: 1.0  1.0;
+              offset:   -1  -11;
+           }
+           image {
+              normal: "e17_shelf5.png";
+              border: 4 4 4 4;
            }
-           color: 255 0 0 100;
         }
       }
       part {
         name:          "resize_b2";
-        mouse_events:  1;
-        type:          RECT;
         description {
            state:    "default" 0.0;
            rel1 {
               relative: 1.0  1.0;
-              offset:   -5    -5;
+              offset:   -32  -10;
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -1  -1;
+           }
+           image {
+              normal: "e17_shelf6.png";
            }
-           color: 255 0 0 100;
         }
       }
    }

diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 6b97826..a8a335a 100644 (file)
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -417,4 +417,14 @@ e17_entry_cursor.png \
 e17_border1b.png \
 e17_border3b.png \
 e17_border5b.png \
-e17_border7b.png
+e17_border7b.png \
+e17_shelf1.png \
+e17_shelf2.png \
+e17_shelf3.png \
+e17_shelf4.png \
+e17_shelf5.png \
+e17_shelf6.png \
+e17_shelf_bg1.png \
+e17_shelf_bg2.png \
+e17_shelf_sh1.png \
+e17_shelf_sh2.png

diff --git a/data/themes/images/e17_shelf1.png b/data/themes/images/e17_shelf1.png
new file mode 100644 (file)
index 0000000..5b8c3b7
Binary files /dev/null and b/data/themes/images/e17_shelf1.png differ

diff --git a/data/themes/images/e17_shelf2.png b/data/themes/images/e17_shelf2.png
new file mode 100644 (file)
index 0000000..a869737
Binary files /dev/null and b/data/themes/images/e17_shelf2.png differ

diff --git a/data/themes/images/e17_shelf3.png b/data/themes/images/e17_shelf3.png
new file mode 100644 (file)
index 0000000..3b04746
Binary files /dev/null and b/data/themes/images/e17_shelf3.png differ

diff --git a/data/themes/images/e17_shelf4.png b/data/themes/images/e17_shelf4.png
new file mode 100644 (file)
index 0000000..6a78fb2
Binary files /dev/null and b/data/themes/images/e17_shelf4.png differ

diff --git a/data/themes/images/e17_shelf5.png b/data/themes/images/e17_shelf5.png
new file mode 100644 (file)
index 0000000..c40b4c6
Binary files /dev/null and b/data/themes/images/e17_shelf5.png differ

diff --git a/data/themes/images/e17_shelf6.png b/data/themes/images/e17_shelf6.png
new file mode 100644 (file)
index 0000000..de62782
Binary files /dev/null and b/data/themes/images/e17_shelf6.png differ

diff --git a/data/themes/images/e17_shelf_bg1.png b/data/themes/images/e17_shelf_bg1.png
new file mode 100644 (file)
index 0000000..1ff2380
Binary files /dev/null and b/data/themes/images/e17_shelf_bg1.png differ

diff --git a/data/themes/images/e17_shelf_bg2.png b/data/themes/images/e17_shelf_bg2.png
new file mode 100644 (file)
index 0000000..de1de71
Binary files /dev/null and b/data/themes/images/e17_shelf_bg2.png differ

diff --git a/data/themes/images/e17_shelf_sh1.png b/data/themes/images/e17_shelf_sh1.png
new file mode 100644 (file)
index 0000000..074142e
Binary files /dev/null and b/data/themes/images/e17_shelf_sh1.png differ

diff --git a/data/themes/images/e17_shelf_sh2.png b/data/themes/images/e17_shelf_sh2.png
new file mode 100644 (file)
index 0000000..fcd5656
Binary files /dev/null and b/data/themes/images/e17_shelf_sh2.png differ

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 090e5f9..8bfd958 100644 (file)
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1041,7 +1041,7 @@ e_config_init(void)
        cf_escf->x = 0;
        cf_escf->y = 0;
        cf_escf->w = 800;
-       cf_escf->h = 32;
+       cf_escf->h = 40;
        cf_escf->orient = E_GADCON_ORIENT_TOP;
        cf_escf->style = evas_stringshare_add("default");
        cf_es->configs = evas_list_append(cf_es->configs, cf_escf);