Enlightenment

Log:
elfe: launch application without arguments
  use efreet_desktop_command_get to run app instead of menu->exec field directly
  

Author:       captainigloo
Date:         2011-02-23 10:43:49 -0800 (Wed, 23 Feb 2011)
New Revision: 57270
Trac:         http://trac.enlightenment.org/e/changeset/57270

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/gadgets.c trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadgets.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-23 18:16:46 UTC (rev 57269)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-23 18:43:49 UTC (rev 57270)
@@ -120,12 +120,20 @@
     Elfe_Gadget *gadget;
 };
 
+static void*
+_app_exec_cb(void *data, Efreet_Desktop *desktop, char *command, int remaining)
+{
+    ecore_exe_run(command, NULL);
+}
+
+
 static void
 _app_mouse_click_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
     App_Item *app_item = data;
 
-    ecore_exe_run(app_item->desktop->exec, NULL);
+    efreet_desktop_command_get(app_item->desktop, NULL,
+                               _app_exec_cb, NULL);
 }
 
 void

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-23 18:16:46 UTC (rev 57269)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-23 18:43:49 UTC (rev 57270)
@@ -204,6 +204,12 @@
    evas_object_event_callback_add(hwin->desktop, EVAS_CALLBACK_MOUSE_UP, _icon_mouse_up_cb, hwin);
 }
 
+static void*
+_app_exec_cb(void *data, Efreet_Desktop *desktop, char *command, int remaining)
+{
+    ecore_exe_run(command, NULL);
+}
+
 static void
 _allapps_item_selected_cb(void *data , Evas_Object *obj, void *event_info)
 {
@@ -211,9 +217,13 @@
     Evas_Object *o_edje;
     Elfe_Home_Win *hwin = data;
 
-    ecore_exe_run(menu->desktop->exec, NULL);
+
+
     o_edje = elm_layout_edje_get(hwin->layout);
     edje_object_signal_emit(o_edje, "appslist,toggle", "elfe");
+
+    efreet_desktop_command_get(menu->desktop, NULL,
+                               _app_exec_cb, NULL);
 }
 
 static void  _edje_signal_cb(void *data, Evas_Object *obj, const char *emission, const char *source)

Log:
elfe: remove unused signal
  

Author:       captainigloo
Date:         2011-02-23 10:48:06 -0800 (Wed, 23 Feb 2011)
New Revision: 57271
Trac:         http://trac.enlightenment.org/e/changeset/57271

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 18:43:49 UTC (rev 57270)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 18:48:06 UTC (rev 57271)
@@ -109,13 +109,6 @@
      }
 }
 
-static Eina_Bool
-_desktop_cache_update(void *data, int type, void *event)
-{
-
-   return ECORE_CALLBACK_PASS_ON;
-}
-
 Evas_Object *
 elfe_allapps_add(Evas_Object *parent)
 {
@@ -146,10 +139,6 @@
    _add_items(list, NULL);
    evas_object_show(list);
 
-   ecore_event_handler_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE,
-                           _desktop_cache_update,
-                           NULL);
-
    return list;
 }

Log:
elfe: Change gengrid item size dynamically
  gengrid  of allapps menu are now changed dynamically with 1/4 of the global width.
  
  

Author:       captainigloo
Date:         2011-02-23 12:03:18 -0800 (Wed, 23 Feb 2011)
New Revision: 57275
Trac:         http://trac.enlightenment.org/e/changeset/57275

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:03:12 UTC (rev 57274)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:03:18 UTC (rev 57275)
@@ -109,6 +109,17 @@
      }
 }
 
+static void
+_list_resize_cb(void *data , Evas *e , Evas_Object *obj, void *event_info )
+{
+    Evas_Coord w, h;
+    Evas_Coord size = 0;
+
+    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+    size = w / 4;
+    elm_gengrid_item_size_set(obj, size, size);
+}
+
 Evas_Object *
 elfe_allapps_add(Evas_Object *parent)
 {
@@ -120,7 +131,11 @@
 
    /* FIXME use dynamic item size */
    list = elm_gengrid_add(parent);
-   elm_gengrid_item_size_set(list, 128, 128);
+   elm_gengrid_item_size_set(list, 0, 0);
+
+   evas_object_event_callback_add(list, EVAS_CALLBACK_RESIZE,
+				  _list_resize_cb, NULL);
+
    elm_gengrid_multi_select_set(list, EINA_FALSE);
    elm_gengrid_bounce_set(list, EINA_FALSE, EINA_TRUE);

Log:
elfe: genlist item size is 1/4 of the height for landscape resolutions
  
  

Author:       captainigloo
Date:         2011-02-23 12:03:23 -0800 (Wed, 23 Feb 2011)
New Revision: 57276
Trac:         http://trac.enlightenment.org/e/changeset/57276

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:03:18 UTC (rev 57275)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:03:23 UTC (rev 57276)
@@ -116,7 +116,9 @@
     Evas_Coord size = 0;
 
     evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-    size = w / 4;
+
+    (h > w) ? (size = w / 4) : (size = h / 4);
+
     elm_gengrid_item_size_set(obj, size, size);
 }

Log:
elfe: use the default icon when none is found
  
  

Author:       captainigloo
Date:         2011-02-23 12:03:34 -0800 (Wed, 23 Feb 2011)
New Revision: 57278
Trac:         http://trac.enlightenment.org/e/changeset/57278

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c trunk/E-MODULES-EXTRA/elfe/src/utils.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:03:29 UTC (rev 57277)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:03:34 UTC (rev 57278)
@@ -1,6 +1,8 @@
+#include <e.h>
 #include <Elementary.h>
 
 #include "utils.h"
+#include "elfe_config.h"
 
 typedef struct _Elfe_Grid_Item Elfe_Grid_Item;
 
@@ -43,7 +45,10 @@
    if (!strcmp(part, "elm.swallow.icon"))
      {
 	ic = elm_icon_add(obj);
-	elm_icon_file_set(ic, gitem->icon_path, NULL);
+        if (gitem->icon_path && gitem->icon_path[0] == '/')
+            elm_icon_file_set(ic, gitem->icon_path, NULL);
+        else
+            elm_icon_file_set(ic, elfe_home_cfg->theme, gitem->icon_path);
      }
 
    return ic;
@@ -100,6 +105,8 @@
 	   case EFREET_MENU_ENTRY_DESKTOP :
 	      gitem = calloc(1, sizeof(Elfe_Grid_Item));
 	      gitem->icon_path = elfe_utils_fdo_icon_path_get(it, 72);
+              if (!gitem->icon_path)
+                  gitem->icon_path = eina_stringshare_add("icon/application-default");
 	      gitem->menu = it;
 	      grid_items = eina_list_append(grid_items, gitem);
 	      elm_gengrid_item_append(parent, &app_itc, gitem, _item_selected, gitem);

Modified: trunk/E-MODULES-EXTRA/elfe/src/utils.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/utils.c	2011-02-23 20:03:29 UTC (rev 57277)
+++ trunk/E-MODULES-EXTRA/elfe/src/utils.c	2011-02-23 20:03:34 UTC (rev 57278)
@@ -1,6 +1,9 @@
+#include <e.h>
 #include <Elementary.h>
 #include <Efreet.h>
 
+#include "elfe_config.h"
+
 Evas_Object *
 elfe_utils_fdo_icon_add(Evas_Object *parent, const char *icon, int size)
 {
@@ -35,7 +38,9 @@
      }
 
    if (path)
-	elm_icon_file_set(ic, path, NULL);
+       elm_icon_file_set(ic, path, NULL);
+   else
+       elm_icon_file_set(ic, elfe_home_cfg->theme, "icon/application-default");
 
    return ic;
 }

Log:
elfe: use smaller floating icon.
  
  

Author:       captainigloo
Date:         2011-02-23 12:03:39 -0800 (Wed, 23 Feb 2011)
New Revision: 57279
Trac:         http://trac.enlightenment.org/e/changeset/57279

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-23 20:03:34 UTC (rev 57278)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-23 20:03:39 UTC (rev 57279)
@@ -180,20 +180,25 @@
    Evas_Object *ic;
    Evas_Coord x, y;
    Evas_Object *o_edje;
+   Evas_Coord ow, oh;
+   Evas_Coord size = 0;
 
+   evas_object_geometry_get(hwin->desktop, NULL, NULL, &ow, &oh);
 
+   size = MIN(ow, oh) / 5;
+
    elfe_desktop_edit_mode_set(hwin->desktop, EINA_TRUE);
 
    o_edje = elm_layout_edje_get(hwin->layout);
    edje_object_signal_emit(o_edje, "appslist,toggle", "elfe");
  
-   ic = elfe_utils_fdo_icon_add(o_edje, entry->icon, 92);
+   ic = elfe_utils_fdo_icon_add(o_edje, entry->icon, size);
    evas_object_show(ic);
    evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y);
-   evas_object_resize(ic, 92, 92);
-   evas_object_move(ic, x - 92 / 2, y - 92 /2);
+   evas_object_resize(ic, size, size);
+   evas_object_move(ic, x - size / 2, y - size /2);
    hwin->floating_icon = ic;
- 
+
    evas_object_del(hwin->allapps);
    hwin->allapps = NULL;
    evas_object_pass_events_set(ic, EINA_TRUE);

Log:
elfe: free allocated items when gengrid is deleted
  
  

Author:       captainigloo
Date:         2011-02-23 12:22:27 -0800 (Wed, 23 Feb 2011)
New Revision: 57282
Trac:         http://trac.enlightenment.org/e/changeset/57282

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:21:30 UTC (rev 57281)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-02-23 20:22:27 UTC (rev 57282)
@@ -129,6 +129,21 @@
     elm_gengrid_item_size_set(obj, size, size);
 }
 
+static void
+_list_del_cb(void *data , Evas *e , Evas_Object *obj, void *event_info )
+{
+    Elfe_Grid_Item *it;
+
+    EINA_LIST_FREE(grid_items, it)
+      {
+	 if (!it) continue;
+	 if (it->icon_path)
+	   eina_stringshare_del(it->icon_path);
+	 free(it);
+      }
+    grid_items = NULL;
+}
+
 Evas_Object *
 elfe_allapps_add(Evas_Object *parent)
 {
@@ -144,6 +159,8 @@
 
    evas_object_event_callback_add(list, EVAS_CALLBACK_RESIZE,
 				  _list_resize_cb, NULL);
+   evas_object_event_callback_add(list, EVAS_CALLBACK_DEL,
+				  _list_del_cb, NULL);
 
    elm_gengrid_multi_select_set(list, EINA_FALSE);
    elm_gengrid_bounce_set(list, EINA_FALSE, EINA_TRUE);

Log:
elfe: Do not resize elfe window when virtual keyboard is active.
  
  

Author:       captainigloo
Date:         2011-02-23 23:50:50 -0800 (Wed, 23 Feb 2011)
New Revision: 57292
Trac:         http://trac.enlightenment.org/e/changeset/57292

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-24 07:46:43 UTC (rev 57291)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-24 07:50:50 UTC (rev 57292)
@@ -317,6 +317,7 @@
    e_win_name_class_set(hwin->win, "Elfe", "Elfe");
    e_win_resize_callback_set(hwin->win, _elfe_home_win_cb_resize);
    e_win_no_remember_set(hwin->win, EINA_TRUE);
+   ecore_x_e_illume_conformant_set(hwin->win->evas_win, EINA_TRUE);
 
    snprintf(buf, sizeof(buf), "%s/default.edj",
             elfe_home_cfg->mod_dir);

Log:
elfe: Add zone to gadcon
  Add a valid E_Zone to gadcon and set the correct client_class. Fix segv of E modules that need this class and zone
  
  

Author:       captainigloo
Date:         2011-02-24 09:17:28 -0800 (Thu, 24 Feb 2011)
New Revision: 57302
Trac:         http://trac.enlightenment.org/e/changeset/57302

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c trunk/E-MODULES-EXTRA/elfe/src/desktop.h trunk/E-MODULES-EXTRA/elfe/src/gadgets.c trunk/E-MODULES-EXTRA/elfe/src/gadgets.h trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-02-24 15:18:10 UTC (rev 57301)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-02-24 17:17:28 UTC (rev 57302)
@@ -227,7 +227,7 @@
 }
 
 Evas_Object *
-elfe_desktop_add(Evas_Object *parent)
+elfe_desktop_add(Evas_Object *parent, E_Zone *zone)
 {
    Evas_Object *tb, *pad, *bx, *ly;
 
@@ -303,7 +303,7 @@
         elm_box_pack_end(bx, tb);
 
         desktop_name = eina_stringshare_printf("Elfe Desktop %d", i);
-        gad = elfe_gadgets_zone_add(tb, i, desktop_name);
+        gad = elfe_gadgets_zone_add(tb, zone, i, desktop_name);
         evas_object_show(gad);
 
         desk->gadgets = eina_list_append(desk->gadgets, gad);

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.h	2011-02-24 15:18:10 UTC (rev 57301)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.h	2011-02-24 17:17:28 UTC (rev 57302)
@@ -3,7 +3,7 @@
 
 #include <Elementary.h>
 
-Evas_Object *elfe_desktop_add(Evas_Object *parent);
+Evas_Object *elfe_desktop_add(Evas_Object *parent, E_Zone *zone);
 Evas_Object *elfe_desktop_gadget_list(Evas_Object *obj);
 
 #endif /* _DESKTOP_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadgets.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-24 15:18:10 UTC (rev 57301)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-24 17:17:28 UTC (rev 57302)
@@ -87,6 +87,8 @@
 	       x = i*w;
 	       y = j*h;
 	       gcc = cc->func.init(egad->gc, cc->name, "test", cc->default_style);
+               gcc->cf = NULL;
+               gcc->client_class = cc;
 	       ly = _item_add(egad,  ELFE_DESKTOP_ITEM_GADGET, cc->name, gcc->o_base, i, j, x, y, w, h);
 	       if (ly)
 		 {
@@ -203,7 +205,7 @@
 
 
 Evas_Object *
-elfe_gadgets_zone_add(Evas_Object *parent, int desktop, const char *desktop_name)
+elfe_gadgets_zone_add(Evas_Object *parent, E_Zone *zone, int desktop, const char *desktop_name)
 {
    const char *location_name;
    Elfe_Gadget *egad;
@@ -262,6 +264,7 @@
    egad->gc->frame_request.func = NULL;
    egad->gc->resize_request.func = NULL;
    egad->gc->min_size_request.func = NULL;
+   e_gadcon_zone_set(egad->gc, zone);
    e_gadcon_custom_new(egad->gc);
 
    /* Fill zone with config items*/

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadgets.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadgets.h	2011-02-24 15:18:10 UTC (rev 57301)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadgets.h	2011-02-24 17:17:28 UTC (rev 57302)
@@ -3,6 +3,6 @@
 
 #include <Elementary.h>
 
-Evas_Object *elfe_gadgets_zone_add(Evas_Object *parent, int desktop, const char *desktop_name);
+Evas_Object *elfe_gadgets_zone_add(Evas_Object *parent, E_Zone *zone, int desktop, const char *desktop_name);
 void elfe_gadgets_gadget_add(Evas_Object *obj, E_Gadcon_Client_Class *gcc);
 #endif /* _GADGETS_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-24 15:18:10 UTC (rev 57301)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-24 17:17:28 UTC (rev 57302)
@@ -372,7 +372,7 @@
    evas_object_show(hwin->allapps);
    elm_layout_content_set(hwin->layout, "apps-list-swallow", hwin->allapps);
 
-   hwin->desktop = elfe_desktop_add(hwin->layout);
+   hwin->desktop = elfe_desktop_add(hwin->layout, hwin->zone);
    elm_layout_content_set(hwin->layout, "launcher.swallow", hwin->desktop);
    evas_object_smart_callback_add(hwin->desktop, "longpressed", _desktop_longpressed_cb, hwin);
    evas_object_smart_callback_add(hwin->desktop, "gadget,added", _gadget_added_cb, hwin);

Log:
elfe: fix use of uninitialised var (thanks cedric)
  
  

Author:       captainigloo
Date:         2011-02-24 09:17:34 -0800 (Thu, 24 Feb 2011)
New Revision: 57303
Trac:         http://trac.enlightenment.org/e/changeset/57303

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c trunk/E-MODULES-EXTRA/elfe/src/desktop.h trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c trunk/E-MODULES-EXTRA/elfe/src/gadgets.c trunk/E-MODULES-EXTRA/elfe/src/gadgets.h trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-02-24 17:17:28 UTC (rev 57302)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-02-24 17:17:34 UTC (rev 57303)
@@ -227,7 +227,7 @@
 }
 
 Evas_Object *
-elfe_desktop_add(Evas_Object *parent, E_Zone *zone)
+elfe_desktop_add(Evas_Object *parent)
 {
    Evas_Object *tb, *pad, *bx, *ly;
 
@@ -303,7 +303,7 @@
         elm_box_pack_end(bx, tb);
 
         desktop_name = eina_stringshare_printf("Elfe Desktop %d", i);
-        gad = elfe_gadgets_zone_add(tb, zone, i, desktop_name);
+        gad = elfe_gadgets_zone_add(tb, i, desktop_name);
         evas_object_show(gad);
 
         desk->gadgets = eina_list_append(desk->gadgets, gad);

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.h	2011-02-24 17:17:28 UTC (rev 57302)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.h	2011-02-24 17:17:34 UTC (rev 57303)
@@ -3,7 +3,7 @@
 
 #include <Elementary.h>
 
-Evas_Object *elfe_desktop_add(Evas_Object *parent, E_Zone *zone);
+Evas_Object *elfe_desktop_add(Evas_Object *parent);
 Evas_Object *elfe_desktop_gadget_list(Evas_Object *obj);
 
 #endif /* _DESKTOP_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-02-24 17:17:28 UTC (rev 57302)
+++ trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-02-24 17:17:34 UTC (rev 57303)
@@ -25,10 +25,8 @@
 int 
 elfe_home_config_init(E_Module *m) 
 {
-   char buff[PATH_MAX];
    Eina_List *l;
 
-
    conf_desktop_item_edd = E_CONFIG_DD_NEW("Elfe_Desktop_Item_Cfg", Elfe_Desktop_Item_Config);
 
 #undef T
@@ -83,7 +81,7 @@
    e_configure_registry_category_add("illume", 0, "Illume", NULL, 
                                      "enlightenment/display");
    e_configure_registry_generic_item_add("illume/elfe", 0, "Elfe", 
-                                         buff, "icon", elfe_home_config_show);
+                                         elfe_home_cfg->theme, "icon", elfe_home_config_show);
    return 1;
 }
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadgets.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-24 17:17:28 UTC (rev 57302)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-24 17:17:34 UTC (rev 57303)
@@ -87,8 +87,6 @@
 	       x = i*w;
 	       y = j*h;
 	       gcc = cc->func.init(egad->gc, cc->name, "test", cc->default_style);
-               gcc->cf = NULL;
-               gcc->client_class = cc;
 	       ly = _item_add(egad,  ELFE_DESKTOP_ITEM_GADGET, cc->name, gcc->o_base, i, j, x, y, w, h);
 	       if (ly)
 		 {
@@ -205,7 +203,7 @@
 
 
 Evas_Object *
-elfe_gadgets_zone_add(Evas_Object *parent, E_Zone *zone, int desktop, const char *desktop_name)
+elfe_gadgets_zone_add(Evas_Object *parent, int desktop, const char *desktop_name)
 {
    const char *location_name;
    Elfe_Gadget *egad;
@@ -264,7 +262,6 @@
    egad->gc->frame_request.func = NULL;
    egad->gc->resize_request.func = NULL;
    egad->gc->min_size_request.func = NULL;
-   e_gadcon_zone_set(egad->gc, zone);
    e_gadcon_custom_new(egad->gc);
 
    /* Fill zone with config items*/

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadgets.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadgets.h	2011-02-24 17:17:28 UTC (rev 57302)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadgets.h	2011-02-24 17:17:34 UTC (rev 57303)
@@ -3,6 +3,6 @@
 
 #include <Elementary.h>
 
-Evas_Object *elfe_gadgets_zone_add(Evas_Object *parent, E_Zone *zone, int desktop, const char *desktop_name);
+Evas_Object *elfe_gadgets_zone_add(Evas_Object *parent, int desktop, const char *desktop_name);
 void elfe_gadgets_gadget_add(Evas_Object *obj, E_Gadcon_Client_Class *gcc);
 #endif /* _GADGETS_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-24 17:17:28 UTC (rev 57302)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-24 17:17:34 UTC (rev 57303)
@@ -372,7 +372,7 @@
    evas_object_show(hwin->allapps);
    elm_layout_content_set(hwin->layout, "apps-list-swallow", hwin->allapps);
 
-   hwin->desktop = elfe_desktop_add(hwin->layout, hwin->zone);
+   hwin->desktop = elfe_desktop_add(hwin->layout);
    elm_layout_content_set(hwin->layout, "launcher.swallow", hwin->desktop);
    evas_object_smart_callback_add(hwin->desktop, "longpressed", _desktop_longpressed_cb, hwin);
    evas_object_smart_callback_add(hwin->desktop, "gadget,added", _gadget_added_cb, hwin);

Log:
elfe: remove configuration panel, there is no config ui currently.
  
  

Author:       captainigloo
Date:         2011-02-24 09:17:40 -0800 (Thu, 24 Feb 2011)
New Revision: 57304
Trac:         http://trac.enlightenment.org/e/changeset/57304

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-02-24 17:17:34 UTC (rev 57303)
+++ trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-02-24 17:17:40 UTC (rev 57304)
@@ -78,10 +78,6 @@
    elfe_home_cfg->mod_dir = eina_stringshare_add(m->dir);
    elfe_home_cfg->theme = eina_stringshare_printf("%s/default.edj", elfe_home_cfg->mod_dir);
 
-   e_configure_registry_category_add("illume", 0, "Illume", NULL, 
-                                     "enlightenment/display");
-   e_configure_registry_generic_item_add("illume/elfe", 0, "Elfe", 
-                                         elfe_home_cfg->theme, "icon", elfe_home_config_show);
    return 1;
 }
 
@@ -108,12 +104,6 @@
    return 1;
 }
 
-void 
-elfe_home_config_show(E_Container *con, const char *params __UNUSED__) 
-{
-
-}
-
 /* local functions */
 static void *
 _elfe_home_config_create(E_Config_Dialog *cfd __UNUSED__)

Log:
elfe: merge two heads
  
  

Author:       captainigloo
Date:         2011-02-24 22:11:03 -0800 (Thu, 24 Feb 2011)
New Revision: 57315
Trac:         http://trac.enlightenment.org/e/changeset/57315

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c trunk/E-MODULES-EXTRA/elfe/src/desktop.h trunk/E-MODULES-EXTRA/elfe/src/gadgets.c trunk/E-MODULES-EXTRA/elfe/src/gadgets.h trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-02-24 22:45:00 UTC (rev 57314)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-02-25 06:11:03 UTC (rev 57315)
@@ -227,7 +227,7 @@
 }
 
 Evas_Object *
-elfe_desktop_add(Evas_Object *parent)
+elfe_desktop_add(Evas_Object *parent, E_Zone *zone)
 {
    Evas_Object *tb, *pad, *bx, *ly;
 
@@ -303,7 +303,7 @@
         elm_box_pack_end(bx, tb);
 
         desktop_name = eina_stringshare_printf("Elfe Desktop %d", i);
-        gad = elfe_gadgets_zone_add(tb, i, desktop_name);
+        gad = elfe_gadgets_zone_add(tb, zone, i, desktop_name);
         evas_object_show(gad);
 
         desk->gadgets = eina_list_append(desk->gadgets, gad);

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.h	2011-02-24 22:45:00 UTC (rev 57314)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.h	2011-02-25 06:11:03 UTC (rev 57315)
@@ -3,7 +3,7 @@
 
 #include <Elementary.h>
 
-Evas_Object *elfe_desktop_add(Evas_Object *parent);
+Evas_Object *elfe_desktop_add(Evas_Object *parent, E_Zone *zone);
 Evas_Object *elfe_desktop_gadget_list(Evas_Object *obj);
 
 #endif /* _DESKTOP_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadgets.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-24 22:45:00 UTC (rev 57314)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadgets.c	2011-02-25 06:11:03 UTC (rev 57315)
@@ -87,6 +87,8 @@
 	       x = i*w;
 	       y = j*h;
 	       gcc = cc->func.init(egad->gc, cc->name, "test", cc->default_style);
+               gcc->cf = NULL;
+               gcc->client_class = cc;
 	       ly = _item_add(egad,  ELFE_DESKTOP_ITEM_GADGET, cc->name, gcc->o_base, i, j, x, y, w, h);
 	       if (ly)
 		 {
@@ -203,7 +205,7 @@
 
 
 Evas_Object *
-elfe_gadgets_zone_add(Evas_Object *parent, int desktop, const char *desktop_name)
+elfe_gadgets_zone_add(Evas_Object *parent, E_Zone *zone, int desktop, const char *desktop_name)
 {
    const char *location_name;
    Elfe_Gadget *egad;
@@ -262,6 +264,7 @@
    egad->gc->frame_request.func = NULL;
    egad->gc->resize_request.func = NULL;
    egad->gc->min_size_request.func = NULL;
+   e_gadcon_zone_set(egad->gc, zone);
    e_gadcon_custom_new(egad->gc);
 
    /* Fill zone with config items*/

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadgets.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadgets.h	2011-02-24 22:45:00 UTC (rev 57314)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadgets.h	2011-02-25 06:11:03 UTC (rev 57315)
@@ -3,6 +3,6 @@
 
 #include <Elementary.h>
 
-Evas_Object *elfe_gadgets_zone_add(Evas_Object *parent, int desktop, const char *desktop_name);
+Evas_Object *elfe_gadgets_zone_add(Evas_Object *parent, E_Zone *zone, int desktop, const char *desktop_name);
 void elfe_gadgets_gadget_add(Evas_Object *obj, E_Gadcon_Client_Class *gcc);
 #endif /* _GADGETS_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-24 22:45:00 UTC (rev 57314)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-25 06:11:03 UTC (rev 57315)
@@ -372,7 +372,7 @@
    evas_object_show(hwin->allapps);
    elm_layout_content_set(hwin->layout, "apps-list-swallow", hwin->allapps);
 
-   hwin->desktop = elfe_desktop_add(hwin->layout);
+   hwin->desktop = elfe_desktop_add(hwin->layout, hwin->zone);
    elm_layout_content_set(hwin->layout, "launcher.swallow", hwin->desktop);
    evas_object_smart_callback_add(hwin->desktop, "longpressed", _desktop_longpressed_cb, hwin);
    evas_object_smart_callback_add(hwin->desktop, "gadget,added", _gadget_added_cb, hwin);

Log:
elfe: Remove conformant property
  Elfe window is overlapped by top/bottom bars if this option is set wich is not what i want.
  
  

Author:       captainigloo
Date:         2011-02-24 22:11:09 -0800 (Thu, 24 Feb 2011)
New Revision: 57316
Trac:         http://trac.enlightenment.org/e/changeset/57316

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-25 06:11:03 UTC (rev 57315)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-02-25 06:11:09 UTC (rev 57316)
@@ -317,7 +317,7 @@
    e_win_name_class_set(hwin->win, "Elfe", "Elfe");
    e_win_resize_callback_set(hwin->win, _elfe_home_win_cb_resize);
    e_win_no_remember_set(hwin->win, EINA_TRUE);
-   ecore_x_e_illume_conformant_set(hwin->win->evas_win, EINA_TRUE);
+   //ecore_x_e_illume_conformant_set(hwin->win->evas_win, EINA_TRUE);
 
    snprintf(buf, sizeof(buf), "%s/default.edj",
             elfe_home_cfg->mod_dir);

Log:
elfe: Add item selected cb each time allapps object is created
  

Author:       captainigloo
Date:         2011-03-02 10:35:08 -0800 (Wed, 02 Mar 2011)
New Revision: 57472
Trac:         http://trac.enlightenment.org/e/changeset/57472

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-03-02 18:22:38 UTC (rev 57471)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-03-02 18:35:08 UTC (rev 57472)
@@ -259,6 +259,7 @@
 	  {
 	     hwin->allapps = elfe_allapps_add(hwin->layout);
 	     evas_object_smart_callback_add(hwin->allapps, "entry,longpressed", _allapps_longpressed_cb, hwin);
+             evas_object_smart_callback_add(hwin->allapps, "item,selected", _allapps_item_selected_cb, hwin);
 	     evas_object_show(hwin->allapps);
 	     elm_layout_content_set(hwin->layout, "apps-list-swallow", hwin->allapps);
 	  }

Log:
elfe: Don't create allapps object at startup
  

Author:       captainigloo
Date:         2011-03-02 10:36:35 -0800 (Wed, 02 Mar 2011)
New Revision: 57473
Trac:         http://trac.enlightenment.org/e/changeset/57473

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-03-02 18:35:08 UTC (rev 57472)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-03-02 18:36:35 UTC (rev 57473)
@@ -366,13 +366,6 @@
    elm_theme_overlay_add(theme, buf);
    elm_object_theme_set(hwin->layout, theme);
 
-
-   hwin->allapps = elfe_allapps_add(hwin->layout);
-   evas_object_smart_callback_add(hwin->allapps, "entry,longpressed", _allapps_longpressed_cb, hwin);
-   evas_object_smart_callback_add(hwin->allapps, "item,selected", _allapps_item_selected_cb, hwin);
-   evas_object_show(hwin->allapps);
-   elm_layout_content_set(hwin->layout, "apps-list-swallow", hwin->allapps);
-
    hwin->desktop = elfe_desktop_add(hwin->layout, hwin->zone);
    elm_layout_content_set(hwin->layout, "launcher.swallow", hwin->desktop);
    evas_object_smart_callback_add(hwin->desktop, "longpressed", _desktop_longpressed_cb, hwin);

Log:
elfe: retrieve gadcon client class from name
  

Author:       captainigloo
Date:         2011-03-08 14:21:09 -0800 (Tue, 08 Mar 2011)
New Revision: 57604
Trac:         http://trac.enlightenment.org/e/changeset/57604

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-03-08 22:01:19 UTC (rev 57603)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-03-08 22:21:09 UTC (rev 57604)
@@ -23,22 +23,22 @@
    Eina_List *l;
    E_Gadcon_Client *gcc = NULL;
 
-   if (!gc)
-     return NULL;
+   if (!gc) return NULL;
 
    item = edje_object_add(evas_object_evas_get(dit->frame));
    edje_object_file_set(item, elfe_home_cfg->theme, "elfe/desktop/gadget/frame");
 
-   EINA_LIST_FOREACH(e_gadcon_provider_list(), l, cc)
+   cc = elfe_utils_gadcon_client_class_from_name(name);
+   if (!cc)
      {
-	if (!strcmp(cc->name, name))
-	  {
-	     gcc = cc->func.init(gc, cc->name, "test", cc->default_style);
-	     gcc->cf = NULL;
-	     gcc->client_class = cc;
-	     edje_object_part_swallow(item, "elfe.swallow.content", gcc->o_base);
-	  }
+	printf("Error unable to retrieve gadcon client class for %s\n", name);
+	return NULL;
      }
+   gcc = cc->func.init(gc, cc->name, "test", cc->default_style);
+   gcc->cf = NULL;
+   gcc->client_class = cc;
+   edje_object_part_swallow(item, "elfe.swallow.content", gcc->o_base);
+
    return item;
 }
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-03-08 22:01:19 UTC (rev 57603)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-03-08 22:21:09 UTC (rev 57604)
@@ -137,6 +137,8 @@
      {
 	Evas_Coord x = 0, y = 0, w = 0, h = 0;
 
+        printf("Page %d populage item [%d %d]: %s\n", page->desktop, dic->col, dic->row, dic->name);
+
 	/* This position is already in use, this is a  conf issue! */
 	/* FIXME: delete item from config ? */
 	if (eina_matrixsparse_data_idx_get(page->items, dic->col, dic->row))

Log:
elfe: try to increase elfe module priority to be sure that other modules are loaded when it starts.
  but it seems not working :(
  

Author:       captainigloo
Date:         2011-03-08 14:22:19 -0800 (Tue, 08 Mar 2011)
New Revision: 57605
Trac:         http://trac.enlightenment.org/e/changeset/57605

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-03-08 22:21:09 UTC (rev 57604)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-03-08 22:22:19 UTC (rev 57605)
@@ -72,6 +72,10 @@
    E_Manager *man;
    Eina_List *ml;
 
+   /* Set this module to be loaded after all other modules, or we don't see
+    modules loaded after this */
+   e_module_priority_set(m, 100);
+
    if (!elfe_home_config_init(m)) return NULL;
 
    e_winilist_init();

Log:
elfe: I guess you could find usefull if this launcher could ... launch apps !
  

Author:       captainigloo
Date:         2011-03-08 14:34:25 -0800 (Tue, 08 Mar 2011)
New Revision: 57606
Trac:         http://trac.enlightenment.org/e/changeset/57606

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-03-08 22:22:19 UTC (rev 57605)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-03-08 22:34:25 UTC (rev 57606)
@@ -42,6 +42,24 @@
    return item;
 }
 
+static void*
+_app_exec_cb(void *data, Efreet_Desktop *desktop, char *command, int remaining)
+{
+   ecore_exe_run(command, NULL);
+}
+
+static void
+_clicked_signal_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   const char *name = data;
+   Efreet_Desktop *desktop;
+
+   desktop = efreet_desktop_get(name);
+   efreet_desktop_command_get(desktop, NULL,
+			      _app_exec_cb, NULL);
+}
+
+
 static Evas_Object *
 _app_add(Elfe_Desktop_Item *dit, const char *name)
 {
@@ -61,6 +79,7 @@
    edje_object_part_swallow(item, "elfe.swallow.content", icon);
 
    edje_object_part_text_set(item, "elfe.text.label", desktop->name);
+   edje_object_signal_callback_add(item, "mouse,clicked,1", "*", _clicked_signal_cb, (void*)name);
 
    return item;
 }

Log:
elfe: remove old code leftovers
  

Author:       captainigloo
Date:         2011-03-08 14:35:11 -0800 (Tue, 08 Mar 2011)
New Revision: 57607
Trac:         http://trac.enlightenment.org/e/changeset/57607

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-03-08 22:34:25 UTC (rev 57606)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-03-08 22:35:11 UTC (rev 57607)
@@ -183,18 +183,6 @@
 
 }
 
-static void
-_gadget_selected_cb(void *data , Evas_Object *obj, void *event_info )
-{
-   E_Gadcon_Client_Class *gcc = data;
-   Evas_Object *gad;
-
-   gad = eina_list_nth(desk->gadgets, desk->current_desktop);
-   elfe_desktop_page_item_gadget_add(gad, gcc, 0, 0);
-   evas_object_smart_callback_call(desk->layout,
-				   "gadget,added", NULL);
-}
-
 void
 elfe_desktop_app_add(Evas_Object *obj, Efreet_Menu *menu, Evas_Coord x, Evas_Coord y)
 {

Log:
elfe: use slide effect for pager as flip has some problems with clips.
  

Author:       captainigloo
Date:         2011-03-14 13:34:30 -0700 (Mon, 14 Mar 2011)
New Revision: 57748
Trac:         http://trac.enlightenment.org/e/changeset/57748

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-03-14 20:33:44 UTC (rev 57747)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-03-14 20:34:30 UTC (rev 57748)
@@ -308,7 +308,7 @@
    allapps->pager = elm_pager_add(allapps->box);
    evas_object_show(allapps->pager);
    elm_box_pack_end(allapps->box, allapps->pager);
-   elm_object_style_set(allapps->pager, "flip");
+   elm_object_style_set(allapps->pager, "slide_invisible");
 
    allapps->grid = elm_gengrid_add(parent);
    elm_gengrid_item_size_set(allapps->grid, 0, 0);

Log:
elfe: fix bug when dragging icon on the desktop
  

Author:       captainigloo
Date:         2011-03-17 02:55:04 -0700 (Thu, 17 Mar 2011)
New Revision: 57818
Trac:         http://trac.enlightenment.org/e/changeset/57818

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-03-17 09:39:36 UTC (rev 57817)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-03-17 09:55:04 UTC (rev 57818)
@@ -375,7 +375,7 @@
 	       over = elm_layout_add(desk->sc);
 	       elm_layout_file_set(over, buf, "elfe/gadget/places/over");
 	       o_edje = elm_layout_edje_get(over);
-               if (elfe_desktop_page_pos_is_free(gad, i, j))
+               if (elfe_desktop_page_pos_is_free(gad, j, i))
                    edje_object_signal_emit(o_edje, "place,busy", "elfe");
                else
                    edje_object_signal_emit(o_edje, "place,free", "elfe");

Log:
elfe: remove unused var
  

Author:       captainigloo
Date:         2011-03-17 02:56:21 -0700 (Thu, 17 Mar 2011)
New Revision: 57819
Trac:         http://trac.enlightenment.org/e/changeset/57819

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-03-17 09:55:04 UTC (rev 57818)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-03-17 09:56:21 UTC (rev 57819)
@@ -371,7 +371,6 @@
 	    {
 	       Evas_Object *o_edje;
 
-	       const char* part;
 	       over = elm_layout_add(desk->sc);
 	       elm_layout_file_set(over, buf, "elfe/gadget/places/over");
 	       o_edje = elm_layout_edje_get(over);
@@ -383,7 +382,6 @@
 	       evas_object_resize(o_edje, m, n);
 	       evas_object_move(o_edje, x + i*m,  y + j*n);
 	       evas_object_show(over);
-	       part = eina_stringshare_printf("edje %d-%d", i, j);
                desk->overs = eina_list_append(desk->overs, over);
 	    }
      }

Log:
elfe: unselect items just after selected them
  

Author:       captainigloo
Date:         2011-04-18 12:02:27 -0700 (Mon, 18 Apr 2011)
New Revision: 58717
Trac:         http://trac.enlightenment.org/e/changeset/58717

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-04-18 18:54:16 UTC (rev 58716)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-04-18 19:02:27 UTC (rev 58717)
@@ -77,10 +77,9 @@
 _gl_longpress(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *popup;
-   Evas_Object *ic;
    Elfe_Grid_Item *gitem;
-   Elm_Ctxpopup_Item *it;
    Elfe_Allapps *allapps = data;
+   Elm_Gengrid_Item *it = event_info;
 
    gitem = elm_gengrid_item_data_get(event_info);
 
@@ -89,6 +88,7 @@
 
    evas_object_smart_callback_call(allapps->box,
 				   "entry,longpressed", gitem->menu);
+   elm_gengrid_item_selected_set(it, EINA_FALSE);
 }
 
 static void
@@ -96,18 +96,22 @@
 {
    const char *name = event_info;
    Elfe_Allapps *allapps = data;
+   Elm_Genlist_Item *it = event_info;
 
    printf("Send widget longpressed\n");
    evas_object_smart_callback_call(allapps->box,
 				   "gadget,longpressed", (void*)name);
+   elm_genlist_item_selected_set(it, EINA_FALSE);
 }
 
 static void
 _item_selected(void *data, Evas_Object *obj, void *event_info)
 {
    Elfe_Grid_Item *gitem = data;
+   Elm_Gengrid_Item *it = event_info;
 
    evas_object_smart_callback_call(gitem->allapps->box, "item,selected", gitem->menu);
+   elm_gengrid_item_selected_set(it, EINA_FALSE);
 }

Log:
elfe: big cleanup, remove all warnings found with -Wall -W and remove dead code
  

Author:       captainigloo
Date:         2011-04-18 12:31:24 -0700 (Mon, 18 Apr 2011)
New Revision: 58718
Trac:         http://trac.enlightenment.org/e/changeset/58718

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c trunk/E-MODULES-EXTRA/elfe/src/desktop.c trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c trunk/E-MODULES-EXTRA/elfe/src/desktop_page.h trunk/E-MODULES-EXTRA/elfe/src/dock.c trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h trunk/E-MODULES-EXTRA/elfe/src/gadget_list.c trunk/E-MODULES-EXTRA/elfe/src/main.c trunk/E-MODULES-EXTRA/elfe/src/winlist.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -29,12 +29,10 @@
 };
 
 static Elm_Gengrid_Item_Class app_itc;
-static Efreet_Menu *menus;
 
-static void _populate_items_cb(void *data, Evas_Object *obj, void *event_info);
 
 static char *
-_label_get(void *data, Evas_Object *obj, const char *part)
+_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
 
    Elfe_Grid_Item *gitem = data;
@@ -49,7 +47,6 @@
 static Evas_Object *
 _icon_get(void *data, Evas_Object *obj, const char *part)
 {
-   const char *path;
    Evas_Object *ic = NULL;
    Elfe_Grid_Item *gitem = data;
 
@@ -74,9 +71,8 @@
 
 
 static void
-_gl_longpress(void *data, Evas_Object *obj, void *event_info)
+_gl_longpress(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
-   Evas_Object *popup;
    Elfe_Grid_Item *gitem;
    Elfe_Allapps *allapps = data;
    Elm_Gengrid_Item *it = event_info;
@@ -92,7 +88,7 @@
 }
 
 static void
-_widget_longpress(void *data, Evas_Object *obj, void *event_info)
+_widget_longpress(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
    const char *name = event_info;
    Elfe_Allapps *allapps = data;
@@ -105,7 +101,7 @@
 }
 
 static void
-_item_selected(void *data, Evas_Object *obj, void *event_info)
+_item_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Elfe_Grid_Item *gitem = data;
    Elm_Gengrid_Item *it = event_info;
@@ -155,12 +151,11 @@
 }
 
 static void
-_obj_resize_cb(void *data , Evas *e , Evas_Object *obj, void *event_info )
+_obj_resize_cb(void *data , Evas *e __UNUSED__ , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Coord w, h;
-   Evas_Coord size = 0;
    Elfe_Allapps *allapps = data;
-   Evas_Coord ow, oh;
+   Evas_Coord ow;
 
    evas_object_geometry_get(allapps->box, NULL, NULL, &w, &h);
 
@@ -175,7 +170,7 @@
 }
 
 static void
-_obj_del_cb(void *data , Evas *e , Evas_Object *obj, void *event_info )
+_obj_del_cb(void *data , Evas *e __UNUSED__ , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Allapps *allapps = data;
    Elfe_Grid_Item *it;
@@ -191,7 +186,7 @@
 }
 
 static void
-_apps_clicked_cb(void *data , Evas_Object *obj, void *event_info)
+_apps_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Allapps *allapps = data;
    Evas_Object *bt;
@@ -211,7 +206,7 @@
 
 
 static void
-_widgets_clicked_cb(void *data , Evas_Object *obj, void *event_info)
+_widgets_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Allapps *allapps = data;
    Evas_Object *bt;
@@ -230,7 +225,7 @@
 
 
 static void
-_config_clicked_cb(void *data , Evas_Object *obj, void *event_info)
+_config_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Allapps *allapps = data;
    Evas_Object *bt;
@@ -252,12 +247,9 @@
 elfe_allapps_add(Evas_Object *parent)
 {
    Elfe_Allapps *allapps;
-   Evas_Object *list;
-   char *path;
    Evas_Object *ic;
    Evas_Object *bt;
    Evas_Object *sep;
-   Eina_List *l;
 
    /* Fixme create an edje layout instead of a box */
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -37,38 +37,12 @@
 
 static Elfe_Desktop *desk;
 
-static void
-_scroller_edge_left_cb(void *data , Evas_Object *obj, void *event_info )
-{
 
-}
-
 static void
-_scroller_edge_right_cb(void *data , Evas_Object *obj, void *event_info )
+_scroller_scroll_anim_stop_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-
-}
-
-
-static void
-_scroller_scroll_cb(void *data , Evas_Object *obj, void *event_info )
-{
-
-}
-
-
-static void
-_scroller_scroll_anim_start_cb(void *data , Evas_Object *obj, void *event_info )
-{
-
-}
-
-static void
-_scroller_scroll_anim_stop_cb(void *data , Evas_Object *obj, void *event_info )
-{
    Elfe_Desktop *desk = data;
    Evas_Coord x, y, w, h;
-   int num;
    int i;
 
 
@@ -90,18 +64,6 @@
      }
 }
 
-static void
-_scroller_scroll_drag_start_cb(void *data , Evas_Object *obj, void *event_info )
-{
-
-}
-
-static void
-_scroller_scroll_drag_stop_cb(void *data , Evas_Object *obj, void *event_info )
-{
-
-}
-
 static Eina_Bool
 _longpress_timer_cb(void *data)
 {
@@ -124,10 +86,9 @@
 }
 
 static void
-_scroller_mouse_move_cb(void *data,Evas *evas, Evas_Object *obj, void *event_info)
+_scroller_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Desktop *desk = data;
-   Evas_Event_Mouse_Move *ev = event_info;
 
    if (!desk->on_hold)
      {
@@ -143,7 +104,7 @@
 
 
 static void
-_scroller_mouse_up_cb(void *data,Evas *evas, Evas_Object *obj, void *event_info)
+_scroller_mouse_up_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Desktop *desk = data;
 
@@ -157,10 +118,9 @@
 
 
 static void
-_scroller_mouse_down_cb(void *data,Evas *evas, Evas_Object *obj, void *event_info)
+_scroller_mouse_down_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Desktop *desk = data;
-   Evas_Event_Mouse_Down *ev = event_info;
 
    if (!desk->edit_mode)
      {
@@ -176,7 +136,7 @@
 
 
 static void
-_cb_object_resize(void *data , Evas *e , Evas_Object *obj, void *event_info )
+_cb_object_resize(void *data , Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elfe_Desktop *desk = data;
    Evas_Coord x, y, w, h;
@@ -202,7 +162,7 @@
 
 
 static void
-_icon_mouse_move_cb(void *data,Evas *evas, Evas_Object *obj, void *event_info)
+_icon_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Elfe_Desktop *desk = data;
    Evas_Event_Mouse_Move *ev = event_info;
@@ -213,10 +173,9 @@
 
 
 static void
-_icon_mouse_up_cb(void *data,Evas *evas, Evas_Object *obj, void *event_info)
+_icon_mouse_up_cb(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
 
-   Elfe_Desktop *desktop = data;
    Evas_Event_Mouse_Up *ev = event_info;
 
    printf("icon mouse up\n");
@@ -322,13 +281,14 @@
 }
 
 static void*
-_app_exec_cb(void *data, Efreet_Desktop *desktop, char *command, int remaining)
+_app_exec_cb(void *data __UNUSED__, Efreet_Desktop *desktop __UNUSED__, char *command, int remaining __UNUSED__)
 {
     ecore_exe_run(command, NULL);
+    return NULL;
 }
 
 static void
-_allapps_item_selected_cb(void *data , Evas_Object *obj, void *event_info)
+_allapps_item_selected_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info)
 {
     Efreet_Menu *menu = event_info;
     Evas_Object *o_edje;
@@ -342,7 +302,7 @@
 }
 
 static void
-_dock_allapps_clicked_cb(void *data , Evas_Object *obj, void *event_info )
+_dock_allapps_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Desktop *desk = data;
    Evas_Object *o_edje;
@@ -398,10 +358,9 @@
 Evas_Object *
 elfe_desktop_add(Evas_Object *parent, E_Zone *zone)
 {
-   Evas_Object *tb, *pad, *bx, *ly;
+   Evas_Object *tb, *pad, *bx;
 
    int i;
-   Evas_Coord x, y, w, h;
    const char *desktop_name;
    Evas_Object *gad;
    char buf[4096];
@@ -504,13 +463,7 @@
    /* evas_object_size_hint_min_set(desk->dock, 0, 80); */
    /* evas_object_size_hint_max_set(desk->dock, 9999, 80); */
 
-   evas_object_smart_callback_add(desk->sc, "edge,left", _scroller_edge_left_cb, desk);
-   evas_object_smart_callback_add(desk->sc, "edge,right", _scroller_edge_right_cb, desk);
-   evas_object_smart_callback_add(desk->sc, "scroll", _scroller_scroll_cb, desk);
-   evas_object_smart_callback_add(desk->sc, "scroll,anim,start", _scroller_scroll_anim_start_cb, desk);
    evas_object_smart_callback_add(desk->sc, "scroll,anim,stop", _scroller_scroll_anim_stop_cb, desk);
-   evas_object_smart_callback_add(desk->sc, "scroll,drag,start", _scroller_scroll_drag_start_cb, desk);
-   evas_object_smart_callback_add(desk->sc, "scroll,drag,stop", _scroller_scroll_drag_stop_cb, desk);
 
    evas_object_event_callback_add(desk->sc, EVAS_CALLBACK_MOUSE_MOVE, _scroller_mouse_move_cb, desk);
    evas_object_event_callback_add(desk->sc, EVAS_CALLBACK_MOUSE_UP, _scroller_mouse_up_cb, desk);

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -31,7 +31,6 @@
 {
    Evas_Object *item;
    E_Gadcon_Client_Class *cc = NULL;
-   Eina_List *l;
    E_Gadcon_Client *gcc = NULL;
 
    if (!gc) return NULL;
@@ -61,13 +60,14 @@
 }
 
 static void*
-_app_exec_cb(void *data, Efreet_Desktop *desktop, char *command, int remaining)
+_app_exec_cb(void *data __UNUSED__, Efreet_Desktop *desktop __UNUSED__, char *command, int remaining __UNUSED__)
 {
    ecore_exe_run(command, NULL);
+   return NULL;
 }
 
 static void
-_clicked_signal_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+_clicked_signal_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    Elfe_Desktop_Item *dit = data;
 
@@ -79,7 +79,7 @@
 }
 
 static void
-_delete_signal_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+_delete_signal_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    Elfe_Desktop_Item *dit = data;
 
@@ -90,7 +90,7 @@
 
 
 static Evas_Object *
-_app_add(Elfe_Desktop_Item *dit, const char *name)
+_app_add(Elfe_Desktop_Item *dit, const char *name __UNUSED__)
 {
    Evas_Object *item;
    Evas_Object *icon;
@@ -167,7 +167,7 @@
 }
 
 static void
-_obj_del_cb(void *data , Evas *e , Evas_Object *obj, void *event_info )
+_obj_del_cb(void *data , Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Desktop_Item *dit = data;
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h	2011-04-18 19:31:24 UTC (rev 58718)
@@ -7,6 +7,6 @@
                                    Elfe_Desktop_Item_Type type,
                                    E_Gadcon *gc);
 void elfe_desktop_item_pos_get(Evas_Object *obj, int *col, int *row);
+void elfe_desktop_item_edit_mode_set(Evas_Object *obj, Eina_Bool mode);
 
-
 #endif /* _DESKTOP_ITEM_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -68,18 +68,19 @@
 }
 
 static void
-_gadcon_populate_class(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
+_gadcon_populate_class(void *data __UNUSED__, E_Gadcon *gc __UNUSED__, const E_Gadcon_Client_Class *cc __UNUSED__)
 {
 }
 
+
 static int
-_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc)
+_gadcon_client_add(void *data __UNUSED__, const E_Gadcon_Client_Class *cc __UNUSED__)
 {
    return 0;
 }
 
 static void
-_gadcon_client_remove(void *data, E_Gadcon_Client *gcc)
+_gadcon_client_remove(void *data __UNUSED__, E_Gadcon_Client *gcc __UNUSED__)
 {
 }
 
@@ -119,13 +120,8 @@
    return gc;
 }
 
-static void _gadcon_del(E_Gadcon *gc)
-{
-   /* FIXME delete gadcon */
-}
-
 static void
-_item_delete_cb(void *data , Evas_Object *obj, void *event_info)
+_item_delete_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info)
 {
    Evas_Object *item = event_info;
    Elfe_Desktop_Page *page = data;
@@ -176,13 +172,12 @@
 }
 
 static void
-_page_resize_cb(void *data , Evas *e , Evas_Object *obj, void *event_info )
+_page_resize_cb(void *data , Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Desktop_Page *page = data;
    Evas_Coord x, y, w, h;
    Evas_Coord ow, oh;
    Evas_Object *item;
-   Eina_List *l;
    int col = 0, row = 0;
    Eina_Iterator *iter;
    Eina_Matrixsparse_Cell *cell;
@@ -285,7 +280,6 @@
 {
    Elfe_Desktop_Page *page = evas_object_data_get(obj, "desktop_page");;
    Evas_Object *item;
-   Eina_List *l;
    Eina_Iterator *iter;
    Eina_Matrixsparse_Cell *cell;
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_page.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_page.h	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_page.h	2011-04-18 19:31:24 UTC (rev 58718)
@@ -3,5 +3,10 @@
 
 Evas_Object *elfe_desktop_page_add(Evas_Object *parent, E_Zone *zone,
                                    int page, const char *desktop_name);
-
+Eina_Bool elfe_desktop_page_pos_is_free(Evas_Object *obj, int row, int col);
+void elfe_desktop_page_item_gadget_add(Evas_Object *obj, const char *name,
+                                       Evas_Coord x, Evas_Coord y);
+void elfe_desktop_page_item_app_add(Evas_Object *obj, Efreet_Menu *menu,
+                                    Evas_Coord x, Evas_Coord y);
+void elfe_desktop_page_edit_mode_set(Evas_Object *obj, Eina_Bool mode);
 #endif /* _DESKTOP_PAGE_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/dock.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/dock.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/dock.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -20,35 +20,11 @@
 static void _allapps_icon_add(Elfe_Dock *dock, const char *name);
 
 static void
-_pos_to_geom(Elfe_Dock *dock,
-	     int row, int col,
-	     Evas_Coord *x, Evas_Coord *y,
-	     Evas_Coord *w, Evas_Coord *h)
-{
-    Evas_Coord ox, oy, ow, oh;
-
-    if(!dock)
-        return;
-
-    evas_object_geometry_get(dock->edje, &ox, &oy, &ow, &oh);
-
-    if (elfe_home_cfg->cols && w)
-        *w = ow / elfe_home_cfg->cols;
-    if (h)
-        *h = oh;
-
-    if (x && w)
-        *x = col * *w;
-    if (y && h)
-        *y = 0;
-}
-
-static void
-_xy_to_pos(Elfe_Dock *dock, Evas_Coord x, Evas_Coord y,
+_xy_to_pos(Elfe_Dock *dock, Evas_Coord x, Evas_Coord y __UNUSED__,
 	   int *col)
 {
    Evas_Coord ow, oh;
-   Evas_Coord w = 0, h = 0;
+   Evas_Coord w = 0;
 
    if(!dock)
      return;
@@ -66,7 +42,7 @@
 
 
 static void
-_item_delete_cb(void *data , Evas_Object *obj, void *event_info)
+_item_delete_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info)
 {
    Evas_Object *item = event_info;
    Elfe_Dock *dock = data;
@@ -82,7 +58,7 @@
 
 
 static void
-_app_icon_clicked_cb(void *data , Evas_Object *obj, void *event_info )
+_app_icon_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elfe_Dock *dock = data;
 
@@ -121,8 +97,6 @@
    Evas_Object *item;
    Eina_List *l;
 
-   Evas_Coord x = 0, y = 0, w = 0, h = 0;
-
    EINA_LIST_FOREACH(elfe_home_cfg->dock_items, l, dic)
      {
 
@@ -150,7 +124,6 @@
 {
    Elfe_Dock *dock = evas_object_data_get(obj, "dock");;
    Evas_Object *item;
-   Eina_List *l;
    Eina_Iterator *iter;
    Eina_Matrixsparse_Cell *cell;
 
@@ -181,7 +154,6 @@
 {
     Elfe_Dock *dock = evas_object_data_get(obj, "dock");
     Evas_Object *item;
-    Evas_Coord ox = 0, oy = 0, ow = 0, oh = 0;
     int col = 0;
 
     _xy_to_pos(dock, x, y, &col);
@@ -214,9 +186,6 @@
 elfe_dock_add(Evas_Object *parent)
 {
    Elfe_Dock *dock;
-   Evas_Object *bx;
-   Evas_Object *ic;
-   int i;
 
    dock = calloc(1, sizeof(Elfe_Dock));
    if (!dock)

Modified: trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -5,13 +5,6 @@
 #include "elfe_config.h"
 
 /* local function prototypes */
-static void *_elfe_home_config_create(E_Config_Dialog *cfd);
-static void _elfe_home_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_elfe_home_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _elfe_home_config_changed(void *data, Evas_Object *obj, void *event);
-static void _elfe_home_config_slider_changed(void *data, Evas_Object *obj);
-static void _elfe_home_config_click_changed(void *data, Evas_Object *obj, void *event);
-static Eina_Bool _elfe_home_config_change_timeout(void *data);
 
 /* local variables */
 EAPI Elfe_Home_Config *elfe_home_cfg = NULL;
@@ -22,11 +15,9 @@
 Evas_Object *delay_label, *delay_slider;
 
 /* public functions */
-int 
-elfe_home_config_init(E_Module *m) 
+int
+elfe_home_config_init(E_Module *m)
 {
-   Eina_List *l;
-
    conf_desktop_item_edd = E_CONFIG_DD_NEW("Elfe_Desktop_Item_Cfg", Elfe_Desktop_Item_Config);
 
 #undef T
@@ -92,8 +83,8 @@
    return 1;
 }
 
-int 
-elfe_home_config_shutdown(void) 
+int
+elfe_home_config_shutdown(void)
 {
    e_configure_registry_item_del("illume/elfe");
    e_configure_registry_category_del("illume");
@@ -107,8 +98,8 @@
    return 1;
 }
 
-int 
-elfe_home_config_save(void) 
+int
+elfe_home_config_save(void)
 {
    printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<< CONFIG SAVE\n");
    e_config_domain_save("module.elfe", conf_edd, elfe_home_cfg);
@@ -116,57 +107,6 @@
 }
 
 /* local functions */
-static void *
-_elfe_home_config_create(E_Config_Dialog *cfd __UNUSED__) 
-{
-   return NULL;
-}
-
-static void 
-_elfe_home_config_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) 
-{
-   elfe_home_win_cfg_update();
-}
-
-static Evas_Object *
-_elfe_home_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) 
-{
- 
-}
-
-static void 
-_elfe_home_config_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 
-{
-   if (_elfe_home_config_change_timer) 
-     ecore_timer_del(_elfe_home_config_change_timer);
-   _elfe_home_config_change_timer = 
-     ecore_timer_add(0.5, _elfe_home_config_change_timeout, data);
-}
-
-static void 
-_elfe_home_config_slider_changed(void *data, Evas_Object *obj __UNUSED__) 
-{
-   if (_elfe_home_config_change_timer) 
-     ecore_timer_del(_elfe_home_config_change_timer);
-   _elfe_home_config_change_timer = 
-     ecore_timer_add(0.5, _elfe_home_config_change_timeout, data);
-}
-
-static void 
-_elfe_home_config_click_changed(void *data, Evas_Object *obj, void *event) 
-{
-   _elfe_home_config_changed(data, obj, event);
-}
-
-static Eina_Bool
-_elfe_home_config_change_timeout(void *data __UNUSED__) 
-{
-   elfe_home_win_cfg_update();
-   e_config_save_queue();
-   _elfe_home_config_change_timer = NULL;
-   return ECORE_CALLBACK_CANCEL;
-}
-
 void elfe_home_config_desktop_item_add(int desktop,
                                        Elfe_Desktop_Item_Type type,
                                        int row, int col,

Modified: trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h	2011-04-18 19:31:24 UTC (rev 58718)
@@ -54,8 +54,9 @@
                                        Evas_Coord x, Evas_Coord y,
                                        Evas_Coord w, Evas_Coord h,
                                        const char *name);
+void elfe_home_config_desktop_item_del(int desktop,
+				       int row, int col);
 
-
 extern EAPI Elfe_Home_Config *elfe_home_cfg;
 
 #endif

Modified: trunk/E-MODULES-EXTRA/elfe/src/gadget_list.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/gadget_list.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/gadget_list.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -5,10 +5,8 @@
 #include "utils.h"
 
 static void
-_list_longpress(void *data, Evas_Object *obj, void *event_info)
+_list_longpress(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
-   Evas_Object *ic;
-   E_Gadcon_Client_Class *gcc = NULL;
    const char *name;
    Elm_List_Item *it = event_info;
 
@@ -26,7 +24,7 @@
    Evas_Object *list;
    E_Gadcon_Client_Class *gcc = NULL;
    Eina_List *l;
-   Evas_Object *icon = NULL, *end;
+   Evas_Object *icon = NULL;
    const char *lbl = NULL;
 
    list = elm_list_add(obj);

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -32,21 +32,11 @@
 static void _elfe_home_win_new(E_Zone *zone);
 static void _elfe_home_win_cb_free(Elfe_Home_Win *hwin);
 static void _elfe_home_win_cb_resize(E_Win *win);
+static Eina_Bool _elfe_home_cb_bg_change(void *data __UNUSED__, int type, void *event __UNUSED__);
 
-static Eina_Bool _elfe_home_update_deferred(void *data __UNUSED__);
-static Eina_Bool _elfe_home_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
-static Eina_Bool _elfe_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event);
-static Eina_Bool _elfe_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event);
-static Eina_Bool _elfe_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event);
-static Eina_Bool _elfe_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
-static Eina_Bool _elfe_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event);
-static Eina_Bool _elfe_home_cb_bg_change(void *data __UNUSED__, int type __UNUSED__, void *event);
-
 /* local variables */
 static Eina_List *hwins = NULL;
 static Eina_List *hdls = NULL;
-static Eina_List *exes = NULL;
-static Ecore_Timer *defer = NULL;
 
 /* public functions */
 EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Home" };
@@ -134,7 +124,6 @@
    char buf[PATH_MAX];
    const char *bgfile;
    Elm_Theme *theme;
-   Evas_Object *winlist;
    Evas_Object *o_edje;
    const char *file;
 
@@ -235,43 +224,7 @@
    if (hwin->layout) evas_object_resize(hwin->layout, win->w, win->h);
 }
 
-
 static Eina_Bool
-_elfe_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_X_Event_Client_Message *ev;
-
-   ev = event;
-   if (ev->message_type == ECORE_X_ATOM_E_ILLUME_HOME_NEW)
-     {
-        E_Zone *zone;
-
-        zone = e_util_zone_window_find(ev->win);
-        if (zone->black_win != ev->win) return ECORE_CALLBACK_PASS_ON;
-        _elfe_home_win_new(zone);
-     }
-   else if (ev->message_type == ECORE_X_ATOM_E_ILLUME_HOME_DEL)
-     {
-        E_Border *bd;
-        Eina_List *l;
-        Elfe_Home_Win *hwin;
-
-        if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
-        EINA_LIST_FOREACH(hwins, l, hwin)
-          {
-             if (hwin->win->border == bd)
-               {
-                  hwins = eina_list_remove_list(hwins, hwins);
-                  e_object_del(E_OBJECT(hwin));
-                  break;
-               }
-          }
-     }
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-
-static Eina_Bool
 _elfe_home_cb_bg_change(void *data __UNUSED__, int type, void *event __UNUSED__)
 {
    Elfe_Home_Win *hwin;

Modified: trunk/E-MODULES-EXTRA/elfe/src/winlist.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/winlist.c	2011-04-18 19:02:27 UTC (rev 58717)
+++ trunk/E-MODULES-EXTRA/elfe/src/winlist.c	2011-04-18 19:31:24 UTC (rev 58718)
@@ -190,7 +190,7 @@
 
 /* internal calls */
 static void
-_cb_item_sel(void *data, Evas_Object *obj, void *event_info)
+_cb_item_sel(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Data *d;
 
@@ -202,7 +202,7 @@
 }
 
 static void
-_cb_special_sel(void *data, Evas_Object *obj, void *event_info)
+_cb_special_sel(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Special *s;
 
@@ -278,7 +278,6 @@
 _cb_object_resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Data *d;
-   Evas_Coord lw, lh, vw, vh;
 
    d = evas_object_data_get(obj, "..[winilist]");
    if (!d) return;
@@ -288,7 +287,6 @@
 static void
 _refill(Data *d)
 {
-   Evas_Coord w, h, lw, lh, vw, vh;
    Eina_List *borders, *l, *l2, *l3;
 
    borders = e_border_client_list();

Log:
Elfe: Be more tolerant to mouse move during edit mode activation by adding threshold
  

Author:       captainigloo
Date:         2011-06-07 11:16:45 -0700 (Tue, 07 Jun 2011)
New Revision: 60046
Trac:         http://trac.enlightenment.org/e/changeset/60046

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-07 17:04:01 UTC (rev 60045)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-07 18:16:45 UTC (rev 60046)
@@ -12,6 +12,8 @@
 #define ELFE_DESKTOP_PADDING_W 10
 #define ELFE_DESKTOP_PADDING_H 10
 
+#define  LONGPRESS_THRESHOLD 16
+
 typedef struct _Elfe_Desktop Elfe_Desktop;
 
 struct _Elfe_Desktop
@@ -32,6 +34,7 @@
    Eina_Bool on_hold;
    Eina_Bool edit_mode;
    Eina_List *overs;
+   Evas_Coord dx, dy;
 };
 
 
@@ -86,20 +89,29 @@
 }
 
 static void
-_scroller_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_scroller_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Elfe_Desktop *desk = data;
+   Evas_Coord dx, dy;
+   Evas_Event_Mouse_Move *ev = event_info;
 
    if (!desk->on_hold)
      {
 	desk->on_hold = EINA_FALSE;
      }
+
    if (desk->longpress_timer)
      {
-	ecore_timer_del(desk->longpress_timer);
-	desk->longpress_timer = NULL;
+        desk->dx += ev->cur.output.x - ev->prev.output.x;
+        desk->dy += ev->cur.output.y - ev->prev.output.y;
+        if (abs(desk->dx) > LONGPRESS_THRESHOLD || abs(desk->dy) > LONGPRESS_THRESHOLD)
+          {
+             ecore_timer_del(desk->longpress_timer);
+             desk->longpress_timer = NULL;
+             desk->dx = 0;
+             desk->dy = 0;
+          }
      }
-
 }
 
 
@@ -113,6 +125,8 @@
      {
 	ecore_timer_del(desk->longpress_timer);
 	desk->longpress_timer = NULL;
+        desk->dx = 0;
+        desk->dy = 0;
      }
 }
 
@@ -128,13 +142,11 @@
 	if (desk->longpress_timer)
 	  ecore_timer_del(desk->longpress_timer);
 	desk->longpress_timer = ecore_timer_add(1.0, _longpress_timer_cb, desk);
+        desk->dx = 0;
+        desk->dy = 0;
      }
 }
 
-
-
-
-
 static void
 _cb_object_resize(void *data , Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {

Log:
Elfe: Add free/busy infos when placing icons in the dock.
  

Author:       captainigloo
Date:         2011-06-07 14:29:18 -0700 (Tue, 07 Jun 2011)
New Revision: 60048
Trac:         http://trac.enlightenment.org/e/changeset/60048

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c trunk/E-MODULES-EXTRA/elfe/src/dock.c trunk/E-MODULES-EXTRA/elfe/src/dock.h 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-07 20:08:31 UTC (rev 60047)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-07 21:29:18 UTC (rev 60048)
@@ -196,7 +196,7 @@
    evas_object_event_callback_del(desk->layout, EVAS_CALLBACK_MOUSE_MOVE, _icon_mouse_move_cb);
    evas_object_event_callback_del(desk->layout, EVAS_CALLBACK_MOUSE_UP, _icon_mouse_up_cb);
    elfe_desktop_edit_mode_set(desk->layout, EINA_FALSE);
-
+   elfe_dock_place_mode_set(desk->dock, EINA_FALSE);
    if (desk->selected_app)
      elfe_desktop_app_add(desk->layout, desk->selected_app, ev->output.x, ev->output.y);
    else if (desk->selected_gadget)
@@ -219,6 +219,7 @@
    evas_object_geometry_get(desk->layout, NULL, NULL, &ow, &oh);
 
    elfe_desktop_edit_mode_set(desk->layout, EINA_TRUE);
+   elfe_dock_place_mode_set(desk->dock, EINA_TRUE);
 
    o_edje = elm_layout_edje_get(desk->layout);
    edje_object_signal_emit(o_edje, "allapps,toggle", "elfe");
@@ -267,6 +268,7 @@
    printf("Gadget long pressed\n");
 
    elfe_desktop_edit_mode_set(desk->layout, EINA_TRUE);
+   elfe_dock_place_mode_set(desk->dock, EINA_TRUE);
 
    o_edje = elm_layout_edje_get(desk->layout);
    edje_object_signal_emit(o_edje, "allapps,toggle", "elfe");
@@ -338,6 +340,7 @@
    else
      {
 	elfe_desktop_edit_mode_set(desk->layout, EINA_FALSE);
+        elfe_dock_place_mode_set(desk->dock, EINA_FALSE);
      }
 }
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/dock.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/dock.c	2011-06-07 20:08:31 UTC (rev 60047)
+++ trunk/E-MODULES-EXTRA/elfe/src/dock.c	2011-06-07 21:29:18 UTC (rev 60048)
@@ -14,7 +14,9 @@
    Evas_Object *table;
    Eina_Matrixsparse *items;
    Evas_Object *allapps_icon;
-   Eina_Bool edit_mode;
+   Eina_Bool edit_mode:  1;
+   Eina_Bool place_mode: 1;
+   Eina_List *overs;
 };
 
 static void _allapps_icon_add(Elfe_Dock *dock, const char *name);
@@ -56,6 +58,14 @@
 
 }
 
+static Eina_Bool
+_pos_is_free(Elfe_Dock *dock, int row, int col)
+{
+   if (eina_matrixsparse_data_idx_get(dock->items, row, col))
+     return EINA_TRUE;
+   else
+     return EINA_FALSE;
+}
 
 static void
 _app_icon_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
@@ -120,9 +130,60 @@
 }
 
 void
+elfe_dock_place_mode_set(Evas_Object *obj, Eina_Bool mode)
+{
+   Elfe_Dock *dock = evas_object_data_get(obj, "dock");
+   int m;
+   int i,j;
+   Evas_Object *over;
+   char buf[PATH_MAX];
+
+   if (dock->place_mode == mode)
+       return;
+
+   dock->place_mode = mode;
+
+   if (mode)
+     {
+	Evas_Coord x, y, w, h;
+
+	evas_object_geometry_get(dock->table, &x, &y, &w, &h);
+	m = w / elfe_home_cfg->cols;
+
+        for (i = 0; i < elfe_home_cfg->cols; i++)
+          {
+             Evas_Object *o_edje;
+             over = elm_layout_add(dock->table);
+             elm_layout_file_set(over, buf, "elfe/gadget/places/over");
+             o_edje = elm_layout_edje_get(over);
+             if (_pos_is_free(dock, 0, i))
+               edje_object_signal_emit(o_edje, "place,busy", "elfe");
+             else
+               edje_object_signal_emit(o_edje, "place,free", "elfe");
+
+             evas_object_resize(o_edje, m, h);
+             evas_object_move(o_edje, x + i*m,  y);
+             evas_object_show(over);
+             dock->overs = eina_list_append(dock->overs, over);
+          }
+     }
+   else
+     {
+	EINA_LIST_FREE(dock->overs, over)
+	  {
+	     evas_object_del(over);
+	  }
+
+	dock->overs = NULL;
+
+     }
+
+}
+
+void
 elfe_dock_edit_mode_set(Evas_Object *obj, Eina_Bool mode)
 {
-   Elfe_Dock *dock = evas_object_data_get(obj, "dock");;
+   Elfe_Dock *dock = evas_object_data_get(obj, "dock");
    Evas_Object *item;
    Eina_Iterator *iter;
    Eina_Matrixsparse_Cell *cell;
@@ -158,8 +219,6 @@
 
     _xy_to_pos(dock, x, y, &col);
 
-    printf("COLONE : %d\n", col);
-
     /* This position is already used by another item! */
     if (eina_matrixsparse_data_idx_get(dock->items, 0, col)) return;
 
@@ -208,3 +267,5 @@
 
    return dock->edje;
 }
+
+

Modified: trunk/E-MODULES-EXTRA/elfe/src/dock.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/dock.h	2011-06-07 20:08:31 UTC (rev 60047)
+++ trunk/E-MODULES-EXTRA/elfe/src/dock.h	2011-06-07 21:29:18 UTC (rev 60048)
@@ -5,5 +5,6 @@
 Evas_Object *elfe_dock_add(Evas_Object *parent);
 void elfe_dock_item_app_add(Evas_Object *obj, Efreet_Menu *menu, Evas_Coord x, Evas_Coord y);
 void elfe_dock_edit_mode_set(Evas_Object *obj, Eina_Bool mode);
+void elfe_dock_place_mode_set(Evas_Object *obj, Eina_Bool mode);
 
 #endif /* _DOCK_H_ */

Log:
Elfe: Save dock items into config
  

Author:       captainigloo
Date:         2011-06-07 14:48:46 -0700 (Tue, 07 Jun 2011)
New Revision: 60049
Trac:         http://trac.enlightenment.org/e/changeset/60049

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c trunk/E-MODULES-EXTRA/elfe/src/dock.c trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-07 21:29:18 UTC (rev 60048)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-07 21:48:46 UTC (rev 60049)
@@ -190,8 +190,6 @@
 
    Evas_Event_Mouse_Up *ev = event_info;
 
-   printf("icon mouse up\n");
-
    evas_object_del(desk->floating_icon);
    evas_object_event_callback_del(desk->layout, EVAS_CALLBACK_MOUSE_MOVE, _icon_mouse_move_cb);
    evas_object_event_callback_del(desk->layout, EVAS_CALLBACK_MOUSE_UP, _icon_mouse_up_cb);
@@ -265,8 +263,6 @@
 
    size = MIN(ow, oh) / 5;
 
-   printf("Gadget long pressed\n");
-
    elfe_desktop_edit_mode_set(desk->layout, EINA_TRUE);
    elfe_dock_place_mode_set(desk->dock, EINA_TRUE);
 
@@ -511,8 +507,6 @@
 
    if (desk->edit_mode == mode)
        return;
-   
-   printf("Elfe desktop edit mode %d\n",mode);
 
    desk->edit_mode = mode;
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-07 21:29:18 UTC (rev 60048)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-07 21:48:46 UTC (rev 60049)
@@ -148,8 +148,6 @@
      {
 	Evas_Coord x = 0, y = 0, w = 0, h = 0;
 
-        printf("Page %d populage item [%d %d]: %s\n", page->desktop, dic->row, dic->col, dic->name);
-
 	/* This position is already in use, this is a  conf issue! */
 	/* FIXME: delete item from config ? */
 	if (eina_matrixsparse_data_idx_get(page->items, dic->row, dic->col))

Modified: trunk/E-MODULES-EXTRA/elfe/src/dock.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/dock.c	2011-06-07 21:29:18 UTC (rev 60048)
+++ trunk/E-MODULES-EXTRA/elfe/src/dock.c	2011-06-07 21:48:46 UTC (rev 60049)
@@ -53,8 +53,7 @@
    elfe_desktop_item_pos_get(item, &row, &col);
    eina_matrixsparse_cell_idx_clear(dock->items, row, col);
    evas_object_del(item);
-   //   elfe_home_config_dock_item_del(dock->desktop,
-   //				     row, col);
+   elfe_home_config_dock_item_del(col);
 
 }
 
@@ -121,6 +120,10 @@
 	  continue;
 
 	evas_object_smart_callback_add(item, "item,delete", _item_delete_cb, dock);
+        evas_object_size_hint_min_set(item, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size);
+        evas_object_size_hint_max_set(item, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size);
+        evas_object_size_hint_align_set(item, 0.5, 0.5);
+
         elm_table_pack(dock->table, item, dic->col, 0, 1, 1);
         evas_object_show(item);
 	eina_matrixsparse_data_idx_set(dock->items, 0, dic->col, item);
@@ -193,8 +196,6 @@
 
    dock->edit_mode = mode;
 
-   printf("Dock edit mode\n");
-
    iter = eina_matrixsparse_iterator_new(dock->items);
    EINA_ITERATOR_FOREACH(iter, cell)
      {
@@ -233,11 +234,8 @@
     elm_table_pack(dock->table, item, col, 0, 1, 1);
 
     eina_matrixsparse_data_idx_set(dock->items, 0, col, item);
-    /* elfe_home_config_desktop_item_add(page->desktop, */
-    /*     			      ELFE_DESKTOP_ITEM_APP, */
-    /*     			      row, col, */
-    /*     			      0, 0, 0, 0, */
-    /*     			      menu->desktop->orig_path); */
+    elfe_home_config_dock_item_add(col,
+                                      menu->desktop->orig_path);
     evas_object_smart_callback_add(item, "item,delete", _item_delete_cb, dock);
 }
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-06-07 21:29:18 UTC (rev 60048)
+++ trunk/E-MODULES-EXTRA/elfe/src/elfe_config.c	2011-06-07 21:48:46 UTC (rev 60049)
@@ -101,12 +101,10 @@
 int
 elfe_home_config_save(void)
 {
-   printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<< CONFIG SAVE\n");
    e_config_domain_save("module.elfe", conf_edd, elfe_home_cfg);
    return 1;
 }
 
-/* local functions */
 void elfe_home_config_desktop_item_add(int desktop,
                                        Elfe_Desktop_Item_Type type,
                                        int row, int col,
@@ -142,16 +140,37 @@
     Elfe_Desktop_Item_Config *dic;
     Eina_List *l;
 
-    printf("DELETE CONFIG ITEM %d %d\n", col, row);
     dc = eina_list_nth(elfe_home_cfg->desktops, desktop);
     EINA_LIST_FOREACH(dc->items, l, dic)
       {
 	 if ((dic->row == row) && (dic->col == col))
 	   {
-	      printf("Delete %d %d\n", row, col);
 	      dc->items = eina_list_remove(dc->items, dic);
 	      elfe_home_config_save();
 	      return;
 	   }
       }
 }
+
+
+void elfe_home_config_dock_item_add(int col,
+                                    const char *name)
+{
+   Elfe_Desktop_Item_Config *dic;
+
+   dic = calloc(1, sizeof(Elfe_Desktop_Item_Config));
+   dic->type = ELFE_DESKTOP_ITEM_ICON;
+   dic->name = eina_stringshare_add(name);
+   dic->col = col;
+   elfe_home_cfg->dock_items = eina_list_append(elfe_home_cfg->dock_items, dic);
+   elfe_home_config_save();
+}
+
+void elfe_home_config_dock_item_del(int col)
+{
+    Elfe_Desktop_Item_Config *dic;
+
+    dic = eina_list_nth(elfe_home_cfg->dock_items, col);
+    elfe_home_cfg->dock_items = eina_list_remove(elfe_home_cfg->dock_items, dic);
+    elfe_home_config_save();
+}

Log:
Elfe: First step to add desktop items reordering, with drag and drop. 
  This version should compile (I didnt' try) only with post 1.0 version 
  of efl :( I'm sorry for that, but it was necessary to do what i want.
  Btw I'am a big fan of elm_transit ! thanks guys :)
  

Author:       captainigloo
Date:         2011-06-14 11:45:34 -0700 (Tue, 14 Jun 2011)
New Revision: 60311
Trac:         http://trac.enlightenment.org/e/changeset/60311

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-06-14 17:43:53 UTC (rev 60310)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_item.c	2011-06-14 18:45:34 UTC (rev 60311)
@@ -186,6 +186,15 @@
 
 }
 
+void
+elfe_desktop_item_pos_set(Evas_Object *obj, int row, int col)
+{
+    Elfe_Desktop_Item *dit = evas_object_data_get(obj, "desktop_item");
+
+    dit->col = col;
+    dit->row = row;
+}
+
 Evas_Object *
 elfe_desktop_item_add(Evas_Object *parent,
 		      int row, int col,

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h	2011-06-14 17:43:53 UTC (rev 60310)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_item.h	2011-06-14 18:45:34 UTC (rev 60311)
@@ -8,5 +8,5 @@
                                    E_Gadcon *gc);
 void elfe_desktop_item_pos_get(Evas_Object *obj, int *col, int *row);
 void elfe_desktop_item_edit_mode_set(Evas_Object *obj, Eina_Bool mode);
-
+void elfe_desktop_item_pos_set(Evas_Object *obj, int row, int col);
 #endif /* _DESKTOP_ITEM_H_ */

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-14 17:43:53 UTC (rev 60310)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-14 18:45:34 UTC (rev 60311)
@@ -15,6 +15,10 @@
    E_Gadcon_Location *location;
    E_Gadcon *gc;
    Eina_Matrixsparse *items;
+   Evas_Object *icon_moved;
+   Eina_Bool edit_mode;
+   Evas_Object *parent;
+   Elm_Transit *placement;
 };
 
 static void
@@ -41,6 +45,8 @@
         *y = row * *h;
 }
 
+
+/* Get closest position(column, row) of a given position (x,y) */
 static void
 _xy_to_pos(Elfe_Desktop_Page *page, Evas_Coord x, Evas_Coord y,
 	   int *row, int *col)
@@ -206,6 +212,16 @@
      return EINA_FALSE;
 }
 
+Evas_Object *
+elfe_desktop_page_obj_at_get(Evas_Object *obj, int row, int col)
+{
+   Elfe_Desktop_Page *page = evas_object_data_get(obj, "desktop_page");
+   Evas_Object *item;
+
+   item = eina_matrixsparse_data_idx_get(page->items, row, col);
+   return item;
+}
+
 void
 elfe_desktop_page_item_gadget_add(Evas_Object *obj, const char *name,
 				Evas_Coord x, Evas_Coord y)
@@ -273,6 +289,120 @@
     evas_object_smart_callback_add(item, "item,delete", _item_delete_cb, page);
 }
 
+
+static void
+_icon_mouse_down_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
+{
+    Elfe_Desktop_Page *page = data;
+
+    if (page->edit_mode)
+        {
+	   Evas_Coord x, y;
+	   page->icon_moved = obj;
+	   evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+//	   page->icon_moved_x = x;
+//	   page->icon_moved_y = y;
+        }
+}
+
+static void
+_icon_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   Elfe_Desktop_Page *page = data;
+   Evas_Event_Mouse_Move *ev = event_info;
+   Evas_Coord w, h;
+   int col, row;
+
+   if (!page->edit_mode || !page->icon_moved)
+     return;
+
+   /* Move dragged icon on the canvas */
+   evas_object_geometry_get(page->icon_moved, NULL, NULL, &w, &h);
+   evas_object_move(page->icon_moved, ev->cur.output.x - w /2  , ev->cur.output.y - h / 2);
+
+   #if 0
+   /* Whats the position ? */
+   _xy_to_pos(page, ev->cur.output.x, ev->cur.output.y,
+              &row, &col);
+
+   if (elfe_desktop_page_pos_is_free(page->layout,
+                                     row,col))
+       {
+	  /*
+	     This position is not free, move the item under the mouse
+	     at the previous position of the dragged icon
+	  */
+	  Evas_Coord x, y, fx, fy, tx, ty, tw, th;
+	  Evas_Object *item;
+	  int trow, tcol;
+
+	  /* Get item under the mouse */
+	  item = elfe_desktop_page_obj_at_get(page->layout,
+					      row, col);
+	  /* If a transit is always active or we object under mouse
+	     is the dragged item do nothing */
+	  if (!item || item == page->icon_moved || page->old)
+	       return;
+
+	  /* Create Transit */
+	  page->old = elm_transit_add();
+
+	  /* Get the position of dragged item */
+	  elfe_desktop_item_pos_get(page->icon_moved, &trow, &tcol);
+
+	  /* Transform this position into x,y position */
+	  _pos_to_geom(page, trow, tcol, &tx, &ty, &tw, &th);
+
+	  /* Add item under the mouse to the transit */
+	  elm_transit_object_add(page->old, item);
+
+	  /* Get the current position of the item under the mouse */
+	  evas_object_geometry_get(item, &fx, &fy, NULL, NULL);
+	  elm_transit_effect_translation_add(page->old, 0, 0, tx - fx, ty - fy);
+	  elm_transit_objects_final_state_keep_set(page->old, EINA_TRUE);
+	  elm_transit_duration_set(page->old, 1.0);
+	  /* And move it */
+	  elm_transit_go(page->old);
+	  elm_transit_del_cb_set(page->old, _transit_old_del_cb, page);
+	  elfe_desktop_item_pos_set(item, trow, tcol);
+	  elfe_desktop_item_pos_set(page->icon_moved, row, col);
+       }
+   #endif
+}
+
+
+static void
+_icon_mouse_up_cb(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   Elfe_Desktop_Page *page = data;
+   Evas_Event_Mouse_Up *ev = event_info;
+   int row, col;
+   Evas_Coord x, y, w, h, fx, fy, tx, ty;
+
+   if (page->edit_mode && page->icon_moved)
+     {
+	_xy_to_pos(page, ev->output.x, ev->output.y,
+		   &row, &col);
+	
+
+	_pos_to_geom(page, row, col,
+		     &tx, &ty, &w, &h);
+
+	page->placement = elm_transit_add();
+	elm_transit_object_add(page->placement, page->icon_moved);
+	evas_object_geometry_get(page->layout, &x, &y, NULL, NULL);
+	evas_object_geometry_get(page->icon_moved, &fx, &fy, NULL, NULL);
+
+	elm_transit_effect_translation_add(page->placement, 0, 0, x + tx - fx, y + ty - fy);
+//	elm_transit_effect_zoom_add(page->placement, 1.0, 2.0);
+//        elm_transit_effect_zoom_add(page->placement, 2.0, 1.0);
+        elm_transit_objects_final_state_keep_set(page->placement, EINA_TRUE);
+	elm_transit_duration_set(page->placement, 0.3);
+	elm_transit_go(page->placement);
+	page->icon_moved = NULL;
+     }
+}
+
 void
 elfe_desktop_page_edit_mode_set(Evas_Object *obj, Eina_Bool mode)
 {
@@ -281,11 +411,24 @@
    Eina_Iterator *iter;
    Eina_Matrixsparse_Cell *cell;
 
+   if (page->edit_mode == mode)
+     return;
+
+   page->edit_mode = mode;
+
+   if (mode)
+     elm_object_scroll_freeze_push(page->parent);
+   else
+     elm_object_scroll_freeze_push(page->parent);
+
    iter = eina_matrixsparse_iterator_new(page->items);
    EINA_ITERATOR_FOREACH(iter, cell)
      {
 	item  = eina_matrixsparse_cell_data_get(cell);
 	elfe_desktop_item_edit_mode_set(item, mode);
+        evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_DOWN, _icon_mouse_down_cb, page);
+        evas_object_event_callback_add(page->layout, EVAS_CALLBACK_MOUSE_MOVE, _icon_mouse_move_cb, page);
+        evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_UP, _icon_mouse_up_cb, page);
      }
    eina_iterator_free(iter);
 }
@@ -301,6 +444,17 @@
    if (!page)
      return NULL;
 
+   /*
+      This is a warkarround :
+      I need a layout (free position of children) and i'm still using
+      e_layout for that.
+      And as e_layout Object doesn't handle elementary objects
+      hierarchy for scroll_freeze, i keep a pointer on the parent,
+      which is in this case an elm_scroller.
+      TODO: use elm_grid instead of e_layout !
+    */
+   page->parent = parent;
+
    page->items = eina_matrixsparse_new(elfe_home_cfg->rows, elfe_home_cfg->cols,
 				       NULL, NULL);

Log:
Elfe: Swap icons when draging an item on another in edit mode
  

Author:       captainigloo
Date:         2011-06-15 12:58:12 -0700 (Wed, 15 Jun 2011)
New Revision: 60360
Trac:         http://trac.enlightenment.org/e/changeset/60360

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop.c trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-15 18:58:34 UTC (rev 60359)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop.c	2011-06-15 19:58:12 UTC (rev 60360)
@@ -12,8 +12,6 @@
 #define ELFE_DESKTOP_PADDING_W 10
 #define ELFE_DESKTOP_PADDING_H 10
 
-#define  LONGPRESS_THRESHOLD 16
-
 typedef struct _Elfe_Desktop Elfe_Desktop;
 
 struct _Elfe_Desktop

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-15 18:58:34 UTC (rev 60359)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-15 19:58:12 UTC (rev 60360)
@@ -19,6 +19,14 @@
    Eina_Bool edit_mode;
    Evas_Object *parent;
    Elm_Transit *placement;
+   struct {
+      Ecore_Timer *timer;
+      Evas_Coord dx;
+      Evas_Coord dy;
+      Evas_Coord x;
+      Evas_Coord y;
+      Elm_Transit *transit;
+   }swap;
 };
 
 static void
@@ -306,28 +314,100 @@
 }
 
 static void
-_icon_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_transit_swap_del_cb(void *data, Elm_Transit *transit)
 {
    Elfe_Desktop_Page *page = data;
-   Evas_Event_Mouse_Move *ev = event_info;
-   Evas_Coord w, h;
-   int col, row;
 
-   if (!page->edit_mode || !page->icon_moved)
-     return;
+   page->swap.transit = NULL;
+}
 
-   /* Move dragged icon on the canvas */
-   evas_object_geometry_get(page->icon_moved, NULL, NULL, &w, &h);
-   evas_object_move(page->icon_moved, ev->cur.output.x - w /2  , ev->cur.output.y - h / 2);
+_icon_placement(Elfe_Desktop_Page *page, Evas_Coord evx, Evas_Coord evy)
+{
+   int row, col;
+   Evas_Coord x, y, w, h, fx, fy, tx, ty;
 
-   #if 0
-   /* Whats the position ? */
-   _xy_to_pos(page, ev->cur.output.x, ev->cur.output.y,
+   _xy_to_pos(page, evx, evy,
               &row, &col);
 
-   if (elfe_desktop_page_pos_is_free(page->layout,
-                                     row,col))
-       {
+   _pos_to_geom(page, row, col,
+                &tx, &ty, &w, &h);
+
+   page->placement = elm_transit_add();
+   elm_transit_object_add(page->placement, page->icon_moved);
+   evas_object_geometry_get(page->layout, &x, &y, NULL, NULL);
+   evas_object_geometry_get(page->icon_moved, &fx, &fy, NULL, NULL);
+
+   elm_transit_effect_translation_add(page->placement, 0, 0, x + tx - fx, y + ty - fy);
+   elm_transit_objects_final_state_keep_set(page->placement, EINA_TRUE);
+   elm_transit_duration_set(page->placement, 0.3);
+   elm_transit_go(page->placement);
+
+   page->icon_moved = NULL;
+   if (page->swap.timer)
+     {
+        ecore_timer_del(page->swap.timer);
+        page->swap.timer = NULL;
+     }
+   page->swap.dx = 0;
+   page->swap.dy = 0;
+
+}
+
+static Eina_Bool
+_swap_timer_cb(void *data)
+{
+   int row, col;
+   int trow, tcol;
+   Evas_Object *item;
+   Evas_Coord tx, ty, tw, th;
+   Evas_Coord fx, fy, fw, fh;
+
+   Elfe_Desktop_Page *page = data;
+
+   _xy_to_pos(page, page->swap.x, page->swap.y,
+              &row, &col);
+
+   /* Get item under the mouse */
+   item = elfe_desktop_page_obj_at_get(page->layout,
+                                       row, col);
+   /* If a transit is always active or we object under mouse
+      is the dragged item : do nothing */
+   if (!item || item == page->icon_moved || page->swap.transit)
+     {
+        page->swap.timer = NULL;
+        return ECORE_CALLBACK_CANCEL;
+     }
+
+   /* Create Transit */
+   page->swap.transit = elm_transit_add();
+
+   /* Get the old position of draggef item */
+   elfe_desktop_item_pos_get(page->icon_moved, &trow, &tcol);
+
+   /* Transform this position into x,y position */
+   _pos_to_geom(page, trow, tcol, &tx, &ty, &tw, &th);
+
+   /* Transform the current position into x,y position */
+   _pos_to_geom(page, row, col, &fx, &fy, &fw, &fh);
+
+   /* Add item under the mouse to the transit */
+   elm_transit_object_add(page->swap.transit, item);
+
+
+   elm_transit_effect_translation_add(page->swap.transit, 0, 0, tx - fx, ty - fy);
+   elm_transit_objects_final_state_keep_set(page->swap.transit, EINA_TRUE);
+   elm_transit_duration_set(page->swap.transit, 0.3);
+   elm_transit_go(page->swap.transit);
+   elm_transit_del_cb_set(page->swap.transit, _transit_swap_del_cb, page);
+   elfe_desktop_item_pos_set(item, trow, tcol);
+   elfe_desktop_item_pos_set(page->icon_moved, row, col);
+
+   elfe_desktop_item_pos_set(item, trow, tcol);
+   elfe_desktop_item_pos_set(page->icon_moved, row, col);
+
+   _icon_placement(page, page->swap.x, page->swap.y);
+
+#if 0
 	  /*
 	     This position is not free, move the item under the mouse
 	     at the previous position of the dragged icon
@@ -337,8 +417,7 @@
 	  int trow, tcol;
 
 	  /* Get item under the mouse */
-	  item = elfe_desktop_page_obj_at_get(page->layout,
-					      row, col);
+
 	  /* If a transit is always active or we object under mouse
 	     is the dragged item do nothing */
 	  if (!item || item == page->icon_moved || page->old)
@@ -366,40 +445,67 @@
 	  elm_transit_del_cb_set(page->old, _transit_old_del_cb, page);
 	  elfe_desktop_item_pos_set(item, trow, tcol);
 	  elfe_desktop_item_pos_set(page->icon_moved, row, col);
-       }
    #endif
+
+   page->swap.timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 
 static void
+_icon_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   Elfe_Desktop_Page *page = data;
+   Evas_Event_Mouse_Move *ev = event_info;
+   Evas_Coord w, h;
+   int col, row;
+
+   if (!page->edit_mode || !page->icon_moved)
+     return;
+
+   /* Move dragged icon on the canvas */
+   evas_object_geometry_get(page->icon_moved, NULL, NULL, &w, &h);
+   evas_object_move(page->icon_moved, ev->cur.output.x - w /2  , ev->cur.output.y - h / 2);
+
+   if (page->swap.timer)
+     {
+        page->swap.dx += ev->cur.output.x - ev->prev.output.x;
+        page->swap.dy += ev->cur.output.y - ev->prev.output.y;
+        if (abs(page->swap.dx) > LONGPRESS_THRESHOLD ||
+            abs(page->swap.dy) > LONGPRESS_THRESHOLD)
+          {
+             ecore_timer_del(page->swap.timer);
+             page->swap.timer = NULL;
+             page->swap.dx = 0;
+             page->swap.dy = 0;
+          }
+     }
+   else
+     {
+        /* Whats the position ? */
+        _xy_to_pos(page, ev->cur.output.x, ev->cur.output.y,
+                   &row, &col);
+
+        if (elfe_desktop_page_pos_is_free(page->layout,
+                                          row,col))
+          {
+             page->swap.x = ev->cur.output.x;
+             page->swap.y = ev->cur.output.y;
+             page->swap.timer = ecore_timer_add(0.6, _swap_timer_cb, page);
+          }
+     }
+}
+
+
+static void
 _icon_mouse_up_cb(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Elfe_Desktop_Page *page = data;
    Evas_Event_Mouse_Up *ev = event_info;
-   int row, col;
-   Evas_Coord x, y, w, h, fx, fy, tx, ty;
 
    if (page->edit_mode && page->icon_moved)
      {
-	_xy_to_pos(page, ev->output.x, ev->output.y,
-		   &row, &col);
-	
-
-	_pos_to_geom(page, row, col,
-		     &tx, &ty, &w, &h);
-
-	page->placement = elm_transit_add();
-	elm_transit_object_add(page->placement, page->icon_moved);
-	evas_object_geometry_get(page->layout, &x, &y, NULL, NULL);
-	evas_object_geometry_get(page->icon_moved, &fx, &fy, NULL, NULL);
-
-	elm_transit_effect_translation_add(page->placement, 0, 0, x + tx - fx, y + ty - fy);
-//	elm_transit_effect_zoom_add(page->placement, 1.0, 2.0);
-//        elm_transit_effect_zoom_add(page->placement, 2.0, 1.0);
-        elm_transit_objects_final_state_keep_set(page->placement, EINA_TRUE);
-	elm_transit_duration_set(page->placement, 0.3);
-	elm_transit_go(page->placement);
-	page->icon_moved = NULL;
+        _icon_placement(page, ev->output.x, ev->output.y);
      }
 }
 

Modified: trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h	2011-06-15 18:58:34 UTC (rev 60359)
+++ trunk/E-MODULES-EXTRA/elfe/src/elfe_config.h	2011-06-15 19:58:12 UTC (rev 60360)
@@ -4,6 +4,8 @@
 #define IL_CONFIG_MIN 0
 #define IL_CONFIG_MAJ 0
 
+#define  LONGPRESS_THRESHOLD 16
+
 typedef struct _Elfe_Home_Config Elfe_Home_Config;
 typedef struct _Elfe_Desktop_Config Elfe_Desktop_Config;
 typedef struct _Elfe_Desktop_Item_Config Elfe_Desktop_Item_Config;

Log:
Elfe: pop freeze when getting out of edit mode
  

Author:       captainigloo
Date:         2011-06-15 13:01:58 -0700 (Wed, 15 Jun 2011)
New Revision: 60361
Trac:         http://trac.enlightenment.org/e/changeset/60361

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-15 19:58:12 UTC (rev 60360)
+++ trunk/E-MODULES-EXTRA/elfe/src/desktop_page.c	2011-06-15 20:01:58 UTC (rev 60361)
@@ -525,7 +525,7 @@
    if (mode)
      elm_object_scroll_freeze_push(page->parent);
    else
-     elm_object_scroll_freeze_push(page->parent);
+     elm_object_scroll_freeze_pop(page->parent);
 
    iter = eina_matrixsparse_iterator_new(page->items);
    EINA_ITERATOR_FOREACH(iter, cell)

Log:
E-MODULES-EXTRA/elfe: Remove focus bug when selecting windows from winlist.
  

Author:       captainigloo
Date:         2011-09-04 14:55:41 -0700 (Sun, 04 Sep 2011)
New Revision: 63175
Trac:         http://trac.enlightenment.org/e/changeset/63175

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/winlist.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/winlist.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/winlist.c	2011-09-04 21:15:04 UTC (rev 63174)
+++ trunk/E-MODULES-EXTRA/elfe/src/winlist.c	2011-09-04 21:55:41 UTC (rev 63175)
@@ -363,15 +363,12 @@
         ecore_event_handler_del(h);
      }
 
+   e_grabinput_release(winlist->input_win, winlist->input_win);
    ecore_x_window_free(winlist->input_win);
    winlist->input_win = 0;
    evas_object_del(winlist->layout);
    evas_object_del(winlist->rect);
    elfe_home_winlist_show(EINA_TRUE);
-   e_grabinput_release(winlist->input_win, winlist->input_win);
-   ecore_x_window_free(winlist->input_win);
-
-
    free(winlist);
 }
 
@@ -385,9 +382,10 @@
 _window_mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    Elfe_Winlist_Item *it = data;
-   e_border_show(it->bd);
-   e_border_uniconify(it->bd);
-   e_border_focus_set_with_pointer(it->bd);
+
+   ecore_x_netwm_client_active_request(0, it->bd->client.win,
+                                       1, 0);
+
    e_manager_comp_src_hidden_set(it->man, it->src, EINA_FALSE);
    _winlist_del(it->winlist);
 }

Log:
E-MODULES-EXTRA/elfe: Fix segv in elm_init. Patch by Yoram bar-haim, thanks :)
  

Author:       captainigloo
Date:         2011-10-22 04:17:34 -0700 (Sat, 22 Oct 2011)
New Revision: 64297
Trac:         http://trac.enlightenment.org/e/changeset/64297

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-10-22 11:13:26 UTC (rev 64296)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-10-22 11:17:34 UTC (rev 64297)
@@ -138,6 +138,7 @@
    char buf[PATH_MAX];
    const char *bgfile;
    const char *file;
+   const char *args[] = {"elfe"};
    Evas_Object *rect;
    Evas_Coord w, h;
 
@@ -170,7 +171,7 @@
 
 
    /* Specific ELM initialisation */
-   elm_init(0, NULL);
+   elm_init(1, args);
    elm_need_efreet();
 
    hwin->layout = elm_layout_add(rect);

Log:
E-MODULES-EXTRA/elfe : Fix segfault due to bad argc/argv passed to elm_init
  

Author:       captainigloo
Date:         2011-11-16 14:31:43 -0800 (Wed, 16 Nov 2011)
New Revision: 65314
Trac:         http://trac.enlightenment.org/e/changeset/65314

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/main.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/main.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-11-16 21:06:03 UTC (rev 65313)
+++ trunk/E-MODULES-EXTRA/elfe/src/main.c	2011-11-16 22:31:43 UTC (rev 65314)
@@ -138,7 +138,8 @@
    char buf[PATH_MAX];
    const char *bgfile;
    const char *file;
-   const char *args[] = {"elfe"};
+   char **argv;
+   int argc;
    Evas_Object *rect;
    Evas_Coord w, h;
 
@@ -171,7 +172,8 @@
 
 
    /* Specific ELM initialisation */
-   elm_init(1, args);
+   ecore_app_args_get(&argc, &argv);
+   elm_init(argc, argv);
    elm_need_efreet();
 
    hwin->layout = elm_layout_add(rect);

Log:
E-MODULES-EXTRA/elfe: build again
  

Author:       captainigloo
Date:         2012-01-30 13:37:30 -0800 (Mon, 30 Jan 2012)
New Revision: 67609
Trac:         http://trac.enlightenment.org/e/changeset/67609

Modified:
  trunk/E-MODULES-EXTRA/elfe/src/allapps.c 

Modified: trunk/E-MODULES-EXTRA/elfe/src/allapps.c
===================================================================
--- trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2012-01-30 18:43:39 UTC (rev 67608)
+++ trunk/E-MODULES-EXTRA/elfe/src/allapps.c	2012-01-30 21:37:30 UTC (rev 67609)
@@ -75,7 +75,7 @@
 {
    Elfe_Grid_Item *gitem;
    Elfe_Allapps *allapps = data;
-   Elm_Gengrid_Item *it = event_info;
+   Elm_Object_Item *it = event_info;
 
    gitem = elm_gengrid_item_data_get(event_info);
 
@@ -104,7 +104,7 @@
 _item_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Elfe_Grid_Item *gitem = data;
-   Elm_Gengrid_Item *it = event_info;
+   Elm_Object_Item *it = event_info;
 
    evas_object_smart_callback_call(gitem->allapps->box, "item,selected", gitem->menu);
    elm_gengrid_item_selected_set(it, EINA_FALSE);