Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_fm.c e_fwin.c e_scrollframe.c 


Log Message:


remove frame shadow for desktop - custom scrollframe.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -3 -r1.170 -r1.171
--- e_fm.c      20 May 2007 08:41:35 -0000      1.170
+++ e_fm.c      21 May 2007 14:12:48 -0000      1.171
@@ -284,8 +284,8 @@
 static int _e_fm2_cb_live_timer(void *data);
 
 static const char *_e_fm2_removable_dev_label_get(const char *uuid);
-static void _e_fm2_removable_dev_add(const char *uuid);
-static void _e_fm2_removable_dev_del(const char *uuid);
+static void _e_fm2_removable_dev_add(const char *uuid, const char *label);
+static void _e_fm2_removable_dev_del(const char *uuid, const char *label);
 static void _e_fm2_removable_path_mount(const char *path);
 static void _e_fm2_removable_path_umount(const char *path);
 static void _e_fm2_removable_dev_mount(const char *uuid);
@@ -971,8 +971,9 @@
               {
                  oic = edje_object_add(evas);
                  if (!edje_object_file_set(oic, ici->icon, "icon"))
-                   _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                           "e/icons/fileman/file");
+                   _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                                "base/theme/fileman",
+                                                "e/icons/fileman/file");
               }
             else
               {
@@ -1015,8 +1016,9 @@
    if (S_ISDIR(ici->statinfo.st_mode))
      {
        oic = edje_object_add(evas);
-       _e_fm2_theme_edje_object_set(ic->sd, oic, "base/theme/fileman",
-                               "e/icons/fileman/folder");
+       _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                    "base/theme/fileman",
+                                    "e/icons/fileman/folder");
      }
    else
      {
@@ -1044,8 +1046,9 @@
             if (!icon)
               {
                  oic = edje_object_add(evas);
-                 _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                         "e/icons/fileman/file");
+                 _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                              "base/theme/fileman",
+                                              "e/icons/fileman/file");
                  if (type_ret) *type_ret = "FILE_TYPE";
               }
             else if (!strcmp(icon, "THUMB"))
@@ -1083,8 +1086,9 @@
                  if (!_e_fm2_theme_edje_object_set(ic->sd, oic, 
                                               "base/theme/fileman",
                                               icon))
-                   _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                           "e/icons/fileman/file");
+                   _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                                "base/theme/fileman",
+                                                "e/icons/fileman/file");
                  if (type_ret) *type_ret = "THEME";
               }
             else
@@ -1094,8 +1098,9 @@
                    {
                       oic = edje_object_add(evas);
                       if (!edje_object_file_set(oic, icon, "icon"))
-                        _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                                "e/icons/fileman/file");
+                        _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                                     "base/theme/fileman",
+                                                     "e/icons/fileman/file");
                    }
                  else
                    {
@@ -1174,8 +1179,9 @@
                  if (oic == NULL) 
                    {
                       oic = edje_object_add(evas);         
-                      _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                        "e/icons/fileman/file");
+                      _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                                   "base/theme/fileman",
+                                                   "e/icons/fileman/file");
                       if (type_ret) *type_ret = "FILE_TYPE";
                    }
                  else
@@ -1186,43 +1192,49 @@
             else if (S_ISCHR(ici->statinfo.st_mode))
               {
                  oic = edje_object_add(evas);
-                 _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                         "e/icons/fileman/file");
+                 _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                              "base/theme/fileman",
+                                              "e/icons/fileman/file");
                  if (type_ret) *type_ret = "FILE_TYPE";
               }
             else if (S_ISBLK(ici->statinfo.st_mode))
               {
                  oic = edje_object_add(evas);
-                 _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                         "e/icons/fileman/file");
+                 _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                              "base/theme/fileman",
+                                              "e/icons/fileman/file");
                  if (type_ret) *type_ret = "FILE_TYPE";
               }
             else if (S_ISFIFO(ici->statinfo.st_mode))
               {
                  oic = edje_object_add(evas);
-                 _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                         "e/icons/fileman/file");
+                 _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                              "base/theme/fileman",
+                                              "e/icons/fileman/file");
                  if (type_ret) *type_ret = "FILE_TYPE";
               }
             else if (S_ISSOCK(ici->statinfo.st_mode))
               {
                  oic = edje_object_add(evas);
-                 _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                         "e/icons/fileman/file");
+                 _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                              "base/theme/fileman",
+                                              "e/icons/fileman/file");
                  if (type_ret) *type_ret = "FILE_TYPE";
               }
             else if (ecore_file_can_exec(buf))
               {
                  oic = edje_object_add(evas);
-                 _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                         "e/icons/fileman/file");
+                 _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                              "base/theme/fileman",
+                                              "e/icons/fileman/file");
                  if (type_ret) *type_ret = "FILE_TYPE";
               }
             else
               {
                  oic = edje_object_add(evas);
-                 _e_fm2_theme_edje_object_set(ic->sd, oic, 
"base/theme/fileman",
-                                         "e/icons/fileman/file");
+                 _e_fm2_theme_edje_object_set(ic->sd, oic,
+                                              "base/theme/fileman",
+                                              "e/icons/fileman/file");
                  if (type_ret) *type_ret = "FILE_TYPE";
               }
          }
@@ -2823,10 +2835,12 @@
               {
                  obj = edje_object_add(evas_object_evas_get(ic->sd->obj));
                  if ((ic->sd->config->icon.fixed.w) && 
(ic->sd->config->icon.fixed.h))
-                   _e_fm2_theme_edje_object_set(ic->sd, obj, 
"base/theme/fileman",
+                   _e_fm2_theme_edje_object_set(ic->sd, obj,
+                                                "base/theme/fileman",
                                                 "e/fileman/icon/fixed");
                  else
-                   _e_fm2_theme_edje_object_set(ic->sd, obj, 
"base/theme/fileman",
+                   _e_fm2_theme_edje_object_set(ic->sd, obj,
+                                                "base/theme/fileman",
                                                 "e/fileman/icon/variable");
                   ic->sd->tmp.obj = obj;
 //               printf("CALC OBJ %p\n", ic->sd->tmp.obj);
@@ -2860,8 +2874,9 @@
                  obj = edje_object_add(evas_object_evas_get(ic->sd->obj));
 // vairable sized list items are pretty usless - ignore.                 
 //               if (ic->sd->config->icon.fixed.w)
-                   _e_fm2_theme_edje_object_set(ic->sd, obj, 
"base/theme/fileman",
-                                           "e/fileman/list/fixed");
+                   _e_fm2_theme_edje_object_set(ic->sd, obj,
+                                                "base/theme/fileman",
+                                                "e/fileman/list/fixed");
 //               else
 //                 _e_fm2_theme_edje_object_set(ic->sd, obj, 
"base/theme/fileman",
 //                                         "e/fileman/list/variable");
@@ -2950,11 +2965,13 @@
      {
 //        if (ic->sd->config->icon.fixed.w)
 //       {
-            if (ic->odd)
-              _e_fm2_theme_edje_object_set(ic->sd, ic->obj, 
"base/theme/widgets",
+       if (ic->odd)
+         _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
+                                      "base/theme/widgets",
                                       "e/fileman/list_odd/fixed");
-            else
-              _e_fm2_theme_edje_object_set(ic->sd, ic->obj, 
"base/theme/widgets",
+       else
+         _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
+                                      "base/theme/widgets",
                                       "e/fileman/list/fixed");
 //       }
 //     else
@@ -2970,11 +2987,13 @@
    else
      {
         if (ic->sd->config->icon.fixed.w)
-         _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/fileman",
-                                 "e/fileman/icon/fixed");
+         _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
+                                      "base/theme/fileman",
+                                      "e/fileman/icon/fixed");
        else
-         _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/fileman",
-                                 "e/fileman/icon/variable");
+         _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
+                                      "base/theme/fileman",
+                                      "e/fileman/icon/variable");
      }
    _e_fm2_icon_label_set(ic, ic->obj);
    evas_object_clip_set(ic->obj, ic->sd->clip);
@@ -4416,30 +4435,36 @@
                  if (ic->sd->config->icon.fixed.w)
                    {
                       if (ic->odd)
-                        _e_fm2_theme_edje_object_set(ic->sd, o, 
"base/theme/widgets",
-                                                "e/fileman/list_odd/fixed");
+                        _e_fm2_theme_edje_object_set(ic->sd, o,
+                                                     "base/theme/widgets",
+                                                     
"e/fileman/list_odd/fixed");
                       else
-                        _e_fm2_theme_edje_object_set(ic->sd, o, 
"base/theme/widgets",
-                                                "e/fileman/list/fixed");
+                        _e_fm2_theme_edje_object_set(ic->sd, o,
+                                                     "base/theme/widgets",
+                                                     "e/fileman/list/fixed");
                    }
                  else
                    {
                       if (ic->odd)
-                        _e_fm2_theme_edje_object_set(ic->sd, o, 
"base/theme/widgets",
-                                                "e/fileman/list_odd/variable");
+                        _e_fm2_theme_edje_object_set(ic->sd, o,
+                                                     "base/theme/widgets",
+                                                     
"e/fileman/list_odd/variable");
                       else
-                        _e_fm2_theme_edje_object_set(ic->sd, o, 
"base/theme/widgets",
-                                                "e/fileman/list/variable");
+                        _e_fm2_theme_edje_object_set(ic->sd, o,
+                                                     "base/theme/widgets",
+                                                     
"e/fileman/list/variable");
                    }
               }
             else
               {
                  if (ic->sd->config->icon.fixed.w)
-                   _e_fm2_theme_edje_object_set(ic->sd, o, 
"base/theme/fileman",
-                                           "e/fileman/icon/fixed");
+                   _e_fm2_theme_edje_object_set(ic->sd, o,
+                                                "base/theme/fileman",
+                                                "e/fileman/icon/fixed");
                  else
-                   _e_fm2_theme_edje_object_set(ic->sd, o, 
"base/theme/fileman",
-                                           "e/fileman/icon/variable");
+                   _e_fm2_theme_edje_object_set(ic->sd, o,
+                                                "base/theme/fileman",
+                                                "e/fileman/icon/variable");
               }
             _e_fm2_icon_label_set(ic, o);
             o2 = _e_fm2_icon_icon_direct_set(ic, o,
@@ -4989,22 +5014,25 @@
    
    sd->drop = edje_object_add(evas_object_evas_get(obj));
    evas_object_clip_set(sd->drop, sd->clip);
-   _e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman",
-                          "e/fileman/list/drop_between");
+   _e_fm2_theme_edje_object_set(sd, sd->drop,
+                               "base/theme/fileman",
+                               "e/fileman/list/drop_between");
    evas_object_smart_member_add(sd->drop, obj);
    evas_object_show(sd->drop);
    
    sd->drop_in = edje_object_add(evas_object_evas_get(obj));
    evas_object_clip_set(sd->drop_in, sd->clip);
-   _e_fm2_theme_edje_object_set(sd, sd->drop_in, "base/theme/fileman",
-                          "e/fileman/list/drop_in");
+   _e_fm2_theme_edje_object_set(sd, sd->drop_in,
+                               "base/theme/fileman",
+                               "e/fileman/list/drop_in");
    evas_object_smart_member_add(sd->drop_in, obj);
    evas_object_show(sd->drop_in);
    
    sd->overlay = edje_object_add(evas_object_evas_get(obj));
    evas_object_clip_set(sd->overlay, sd->clip);
-   _e_fm2_theme_edje_object_set(sd, sd->overlay, "base/theme/fileman",
-                          "e/fileman/overlay");
+   _e_fm2_theme_edje_object_set(sd, sd->overlay,
+                               "base/theme/fileman",
+                               "e/fileman/overlay");
    evas_object_smart_member_add(sd->overlay, obj);
    evas_object_show(sd->overlay);
    
@@ -6147,9 +6175,9 @@
    E_Fm2_Removable_Add *e;
    
    e = ev;
-   evas_stringshare_del(e->uuid);
-   evas_stringshare_del(e->label);
-   evas_stringshare_del(e->mount);
+   if (e->uuid) evas_stringshare_del(e->uuid);
+   if (e->label) evas_stringshare_del(e->label);
+   if (e->mount) evas_stringshare_del(e->mount);
    free(e);
 }
 
@@ -6166,22 +6194,40 @@
 }
 
 static void
-_e_fm2_removable_dev_add(const char *uuid)
+_e_fm2_removable_dev_add(const char *uuid, const char *label)
 {
    E_Fm2_Removable *rem;
    FILE *f;
    char buf[PATH_MAX], buf2[PATH_MAX];
    
    /* remove it - in case, so we don't add it twice */
-   _e_fm2_removable_dev_del(uuid);
-   printf("ADD DEV ------- %s\n", uuid);
+   _e_fm2_removable_dev_del(uuid, label);
+   printf("ADD DEV ------- %s %s\n", uuid, label);
    rem = E_NEW(E_Fm2_Removable, 1);
-   rem->uuid = evas_stringshare_add(uuid);
-   rem->label = _e_fm2_removable_dev_label_get(uuid);
-   snprintf(buf, sizeof(buf), "/media/disk_by-uuid_%s", uuid);
-   rem->mount = evas_stringshare_add(buf);
-   snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/|%s.desktop",
-           e_user_homedir_get(), uuid);
+   if (uuid)
+     {
+       rem->uuid = evas_stringshare_add(uuid);
+       rem->label = _e_fm2_removable_dev_label_get(uuid);
+       snprintf(buf, sizeof(buf), "/media/disk_by-uuid_%s", uuid);
+       rem->mount = evas_stringshare_add(buf);
+       snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/|%s.desktop",
+                e_user_homedir_get(), uuid);
+       snprintf(buf2, sizeof(buf2), "%s/Desktop/|%s.desktop",
+                e_user_homedir_get(), uuid);
+       ecore_file_symlink(buf, buf2);
+     }
+   else if (label)
+     {
+       rem->uuid = NULL;
+       rem->label = evas_stringshare_add(label);
+       snprintf(buf, sizeof(buf), "/media/disk_by-label_%s", label);
+       rem->mount = evas_stringshare_add(buf);
+       snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/|%s.desktop",
+                e_user_homedir_get(), label);
+       snprintf(buf2, sizeof(buf2), "%s/Desktop/|%s.desktop",
+                e_user_homedir_get(), label);
+       ecore_file_symlink(buf, buf2);
+     }
    _e_fm2_removables = evas_list_append(_e_fm2_removables, rem);
    f = fopen(buf, "w");
    if (f)
@@ -6204,9 +6250,6 @@
                rem->mount);
        fclose(f);
      }
-   snprintf(buf2, sizeof(buf2), "%s/Desktop/|%s.desktop",
-           e_user_homedir_get(), uuid);
-   ecore_file_symlink(buf, buf2);
    // FIXME: need to maybe have some popup, dialog or other indicator pop up
    // and maybe allow to click to open new removable device - maybe event
    // and broadcast as below then have a module listen and pop up a popup
@@ -6216,21 +6259,21 @@
        E_Fm2_Removable_Add *ev;
        
        ev = E_NEW(E_Fm2_Removable_Add, 1);
-       ev->uuid = evas_stringshare_add(rem->uuid);
-       ev->label = evas_stringshare_add(rem->label);
-       ev->mount = evas_stringshare_add(rem->mount);
+       if (rem->uuid) ev->uuid = evas_stringshare_add(rem->uuid);
+       if (rem->label) ev->label = evas_stringshare_add(rem->label);
+       if (rem->mount) ev->mount = evas_stringshare_add(rem->mount);
        ecore_event_add(E_EVENT_REMOVABLE_ADD, ev, 
_e_fm2_event_removable_add_free, NULL);
      }
 }
 
 static void
-_e_fm2_removable_dev_del(const char *uuid)
+_e_fm2_removable_dev_del(const char *uuid, const char *label)
 {
    E_Fm2_Removable *rem;
    Evas_List *l;
    char buf[4096];
    
-   printf("DEL DEV ------- %s\n", uuid);
+   printf("DEL DEV ------- %s %s\n", uuid, label);
    // FIXME: need to find all fm views for this dev and close them
    _e_fm2_removable_dev_umount(uuid);
    /* FIXME: move to e_fm_main */
@@ -6243,7 +6286,8 @@
    for (l = _e_fm2_removables; l; l = l->next)
      {
        rem = l->data;
-       if (!strcmp(uuid, rem->uuid))
+       if (((uuid) && (!strcmp(uuid, rem->uuid))) ||
+           ((label) && (!strcmp(label, rem->label))))
          {
             // FIXME: need to display popup or some other status here maybe
             // using module to listen to the below event?
@@ -6251,14 +6295,14 @@
                  E_Fm2_Removable_Del *ev;
                  
                  ev = E_NEW(E_Fm2_Removable_Del, 1);
-                 ev->uuid = evas_stringshare_add(rem->uuid);
-                 ev->label = evas_stringshare_add(rem->label);
-                 ev->mount = evas_stringshare_add(rem->mount);
+                 if (rem->uuid) ev->uuid = evas_stringshare_add(rem->uuid);
+                 if (rem->label) ev->label = evas_stringshare_add(rem->label);
+                 if (rem->mount) ev->mount = evas_stringshare_add(rem->mount);
                  ecore_event_add(E_EVENT_REMOVABLE_DEL, ev, 
_e_fm2_event_removable_del_free, NULL);
               }
-            evas_stringshare_del(rem->uuid);
-            evas_stringshare_del(rem->label);
-            evas_stringshare_del(rem->mount);
+            if (rem->uuid) evas_stringshare_del(rem->uuid);
+            if (rem->label) evas_stringshare_del(rem->label);
+            if (rem->mount) evas_stringshare_del(rem->mount);
             free(rem);
             _e_fm2_removables = evas_list_remove_list(_e_fm2_removables, l);
             break;
@@ -6409,9 +6453,14 @@
    if (event->server == _e_fm2_dbus)
      {
        const char *bstr = "/org/freedesktop/Hal/devices/volume_uuid_";
-       int blen;
+       const char *bstr2 = "/org/freedesktop/Hal/devices/volume_label_";
+       const char *bstr3 = "/org/freedesktop/Hal/devices/storage_serial_";
+       // 
/org/freedesktop/Hal/devices/storage_serial_PLEXTOR_DVDR_PX_740A_00D0A905301025695
+       int blen, blen2, blen3;
        
        blen = strlen(bstr);
+       blen2 = strlen(bstr2);
+       blen3 = strlen(bstr3);
        if (!strcmp(event->header.member, "DeviceAdded"))
          {
             printf("E FM: DBus dev add:\n %s\n",
@@ -6421,13 +6470,36 @@
                  char *uuid, *p;
                  
                  uuid = strdup(((char *)event->args[0].value) + blen);
+                 printf("E FM: uuid = %s\n", uuid);
                  for (p = uuid; *p; p++)
                    {
                       if (*p == '_') *p = '-';
                    }
-                 _e_fm2_removable_dev_add(uuid);
+                 printf("E FM: uuid-post = %s\n", uuid);
+                 _e_fm2_removable_dev_add(uuid, NULL);
                  free(uuid);
               }
+            /* cd/dvd's turn up as volumes only when inserted. also abov
+             * bstr3 is what the cd/dvd device itself turns up as
+             * when plugged in but no disk is in yet. volume label bstr2
+             * is what determinies that
+             */
+/*          
+            else if (!strncmp((char *)event->args[0].value, bstr2, blen2))
+              {
+                 char *label, *p;
+                 
+                 label = strdup(((char *)event->args[0].value) + blen2);
+                 printf("E FM: label = %s\n", label);
+                 for (p = label; *p; p++)
+                   {
+                      if (*p == '_') *p = '-';
+                   }
+                 printf("E FM: label-post = %s\n", label);
+                 _e_fm2_removable_dev_add(NULL, label);
+                 free(label);
+              }
+ */
          }
        else if (!strcmp(event->header.member, "DeviceRemoved"))
          {
@@ -6442,9 +6514,23 @@
                    {
                       if (*p == '_') *p = '-';
                    }
-                 _e_fm2_removable_dev_del(uuid);
+                 _e_fm2_removable_dev_del(uuid, NULL);
                  free(uuid);
               }
+/*          
+            else if (!strncmp((char *)event->args[0].value, bstr2, blen2))
+              {
+                 char *label, *p;
+                 
+                 label = strdup(((char *)event->args[0].value) + blen2);
+                 for (p = label; *p; p++)
+                   {
+                      if (*p == '_') *p = '-';
+                   }
+                 _e_fm2_removable_dev_del(NULL, label);
+                 free(label);
+              }
+ */
          }
      }
    return 1;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_fwin.c    20 May 2007 08:41:36 -0000      1.45
+++ e_fwin.c    21 May 2007 14:12:48 -0000      1.46
@@ -268,6 +268,8 @@
    evas_object_show(o);
    
    o = e_scrollframe_add(zone->container->bg_evas);
+   e_scrollframe_custom_theme_set(o, "base/theme/fileman",
+                                 "e/fileman/scrollframe/desktop");
    /* FIXME: this theme object will have more versions and options later
     * for things like swallowing widgets/buttons ot providing them - a
     * gadcon for starters for fm widgets. need to register the owning 
@@ -283,8 +285,6 @@
     * same as currently done for bg & overlay. also add to fm2 the ability
     * to specify the .edj files to get the list and icon theme stuff from
     */
-   e_scrollframe_custom_theme_set(o, "base/theme/fileman",
-                                 "e/fileman/scrollframe/desktop");
    evas_object_data_set(fwin->fm_obj, "fwin", fwin);
    e_scrollframe_extern_pan_set(o, fwin->fm_obj,
                                _e_fwin_pan_set,
@@ -294,7 +294,7 @@
    evas_object_propagate_events_set(fwin->fm_obj, 0);
    fwin->scrollframe_obj = o;
    evas_object_move(o, fwin->zone->x, fwin->zone->y);
-   evas_object_resize(fwin->scrollframe_obj, fwin->zone->w, fwin->zone->h);
+   evas_object_resize(o, fwin->zone->w, fwin->zone->h);
    evas_object_show(o);
 
    e_fm2_window_object_set(fwin->fm_obj, E_OBJECT(fwin->zone));
@@ -446,9 +446,16 @@
                                             (char *)fwin->scrollframe_file,
                                             "e/fileman/scrollframe/default");
        else
-         e_scrollframe_custom_theme_set(fwin->scrollframe_obj,
-                                        "base/theme/fileman",
-                                        "e/fileman/scrollframe/default");
+         {
+            if (fwin->zone)
+              e_scrollframe_custom_theme_set(fwin->scrollframe_obj,
+                                             "base/theme/fileman",
+                                             "e/fileman/scrollframe/desktop");
+            else
+              e_scrollframe_custom_theme_set(fwin->scrollframe_obj,
+                                             "base/theme/fileman",
+                                             "e/fileman/scrollframe/default");
+         }
        e_scrollframe_child_pos_set(fwin->scrollframe_obj, 0, 0);
      }
    if ((fwin->theme_file) && (ecore_file_exists(fwin->theme_file)))
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_scrollframe.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_scrollframe.c     19 Apr 2007 12:16:57 -0000      1.16
+++ e_scrollframe.c     21 May 2007 14:12:48 -0000      1.17
@@ -164,7 +164,7 @@
 e_scrollframe_custom_theme_set(Evas_Object *obj, char *custom_category, char 
*custom_group)
 {
    API_ENTRY return;
-   
+
    e_theme_edje_object_set(sd->edje_obj, custom_category, custom_group);
    if (sd->pan_obj)
      edje_object_part_swallow(sd->edje_obj, "e.swallow.content", sd->pan_obj);



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to