add bg shadow to efm and remove hscrollbar

SVN revision: 17479

diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc
index 39a57cd0ef356b9009e9cb13307f0f21bb8e4760..f5ad8d314dcedc52121c917d2d9e37e490c701cb 100644 (file)
--- a/data/themes/default_fileman.edc
+++ b/data/themes/default_fileman.edc
@@ -88,7 +88,8 @@ group { \
 
 images
 {
-   image: "e17_fileman_bg.png" COMP;   
+   image: "e17_fileman_bg.png" COMP;
+   image: "e17_fileman_bg_shadow.png" COMP;   
    image: "e17_icon_fileman_folder.png" COMP;
    image: "e17_icon_fileman_folder_clicked.png" COMP;   
    image: "e17_icon_fileman_file.png" COMP;
@@ -117,7 +118,7 @@ images
    image: "e17_menu_bg_border.png" COMP;
    image: "e17_button2.png" COMP;
    image: "e17_button.png" COMP;
-   image: "e17_logo.png" COMP;
+   image: "e17_logo.png" COMP;   
 }
 
 styles
@@ -198,6 +199,25 @@ group {
             }
          }
       }
+      part {
+         name: "background_border";
+         mouse_events: 1;
+         description {
+            state: "default" 0.0;
+            rel1 {
+               relative: 0 0;
+               offset: 0 0;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -1 -1;
+            }
+            image {
+              normal: "e17_fileman_bg_shadow.png";
+            }
+           color: 255 255 255 138;
+         }
+      }      
       part {
          name: "icon_area";
         type: SWALLOW;
@@ -214,24 +234,6 @@ group {
             }
          }
       }      
-      part {
-        name: "hscrollbar";
-        type: "SWALLOW";
-        mouse_events: 1;
-        description {
-           min: 40 16;
-           state:      "default" 0.0;
-           rel1 {
-              relative: 0.0 1.0;
-              offset:   0 -16;
-           }
-           rel2 {
-              relative: 1.0 1.0;
-              offset:   -16 -1;
-           }
-           color: 0 0 0 255;       
-        }
-      }
       part {
         name: "vscrollbar";
         type: "SWALLOW";
@@ -245,7 +247,7 @@ group {
            }
            rel2 {
               relative: 1.0 1.0;
-              offset:   0 -16;
+              offset:   0 -1;
            }
            color:  0 0 0 255;      
         }

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

diff --git a/src/bin/e_fileman.c b/src/bin/e_fileman.c
index c03a440960f816a3b86f32d425cd55db00ab862e..a3c63ec5d03c6b33043ae3f125fd9d8bd8aac52d 100644 (file)
--- a/src/bin/e_fileman.c
+++ b/src/bin/e_fileman.c
@@ -13,7 +13,6 @@
  * - create x, y, w, h in canvas struct and make them auto update
  ****/
 
-static void _e_fileman_hscrollbar_drag_cb(Evas_Object *object, double value, void *data);
 static void _e_fileman_vscrollbar_drag_cb(Evas_Object *object, double value, void *data);
 static void _e_fileman_cb_resize(E_Win *win);
 static void _e_fileman_cb_delete(E_Win *win);
@@ -65,10 +64,6 @@ e_fileman_new(E_Container *con)
    e_theme_edje_object_set(fileman->main, "base/theme/fileman/main",
                           "fileman/main");
 
-   fileman->hscrollbar = e_scrollbar_add(fileman->evas);
-   e_scrollbar_callback_drag_add(fileman->hscrollbar, _e_fileman_hscrollbar_drag_cb, fileman);
-   edje_object_part_swallow(fileman->main, "hscrollbar", fileman->hscrollbar);
-
    fileman->vscrollbar = e_scrollbar_add(fileman->evas);
    e_scrollbar_direction_set(fileman->vscrollbar, E_SCROLLBAR_VERTICAL);
    e_scrollbar_callback_drag_add(fileman->vscrollbar, _e_fileman_vscrollbar_drag_cb, fileman);
@@ -109,7 +104,6 @@ static void
 _e_fileman_free(E_Fileman *fileman)
 {
    e_object_unref(E_OBJECT(fileman->con));
-   evas_object_del(fileman->hscrollbar);
    evas_object_del(fileman->vscrollbar);
    evas_object_del(fileman->smart);
    evas_object_del(fileman->main);
@@ -135,14 +129,6 @@ _e_fileman_cb_delete(E_Win *win)
    e_object_del(E_OBJECT(win));
 }
 
-static void
-_e_fileman_hscrollbar_drag_cb(Evas_Object *object, double value, void *data)
-{
-   E_Fileman *fileman;
-
-   fileman = data;
-}
-
 static void
 _e_fileman_vscrollbar_drag_cb(Evas_Object *object, double value, void *data)
 {

diff --git a/src/bin/e_fileman.h b/src/bin/e_fileman.h
index e71298e49f94cf92b9bbfe1ffe89e95524fd22ba..18662e21bbcc7b411a9e293f185943c0030915a9 100644 (file)
--- a/src/bin/e_fileman.h
+++ b/src/bin/e_fileman.h
@@ -20,7 +20,6 @@ struct _E_Fileman
 
    Evas *evas;
    Evas_Object *main;
-   Evas_Object *hscrollbar;
    Evas_Object *vscrollbar;   
 
    Evas_Object *smart;   

diff --git a/src/bin/e_fileman_smart.c b/src/bin/e_fileman_smart.c
index a52b9492554a38add9652db1dc9f558a13a2c5fd..a8b57ffcdbf29ba4affd0648db3cfafcf4710a8c 100644 (file)
--- a/src/bin/e_fileman_smart.c
+++ b/src/bin/e_fileman_smart.c
@@ -691,7 +691,7 @@ _e_fm_smart_add(Evas_Object *object)
        
        
        /* some test values not meant for everyone */
-       /*
+       
        {
           E_Fileman_Assoc_App *assoc;
           
@@ -701,8 +701,15 @@ _e_fm_smart_add(Evas_Object *object)
           assoc->app = E_NEW(char *, 7);
           snprintf(assoc->app, 7, "gqview");
           sd->conf.main->apps = evas_list_append(sd->conf.main->apps, assoc);
+        
+          assoc = E_NEW(E_Fileman_Assoc_App, 1);
+          assoc->mime = E_NEW(char *, 5);
+          snprintf(assoc->mime, 5, "%s", ".png");
+          assoc->app = E_NEW(char *, 7);
+          snprintf(assoc->app, 7, "gqview");
+          sd->conf.main->apps = evas_list_append(sd->conf.main->apps, assoc);
        }
-       */
+       
     }
    
    evas_object_smart_data_set(object, sd);