[E-MODULES-EXTRA/elfe] * Remove modules and config entries, they never worked.
* Restore correct behaviour when placing icons on the desktop * Remove few Elementary errors SVN revision: 76358
This commit is contained in:
parent
3066a4b40e
commit
83a9b32b60
|
@ -582,6 +582,22 @@ collections
|
|||
target: "clip";
|
||||
transition: DECELERATE 0.5;
|
||||
}
|
||||
program {
|
||||
name: "place,show";
|
||||
signal: "place,show";
|
||||
source: "elfe";
|
||||
action: STATE_SET "in" 0.0;
|
||||
target: "over";
|
||||
transition: ACCELERATE 0.5;
|
||||
}
|
||||
program {
|
||||
name: "place,hide";
|
||||
signal: "place,hide";
|
||||
source: "elfe";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "over";
|
||||
transition: DECELERATE 0.5;
|
||||
}
|
||||
program {
|
||||
name: "mouse,in";
|
||||
signal: "mouse,in";
|
||||
|
|
|
@ -82,9 +82,11 @@ _gl_longpress(void *data, Evas_Object *obj __UNUSED__, void *event_info)
|
|||
if (gitem->menu->type != EFREET_MENU_ENTRY_DESKTOP)
|
||||
return;
|
||||
|
||||
elm_gengrid_item_selected_set(event_info, EINA_FALSE);
|
||||
|
||||
evas_object_smart_callback_call(allapps->box,
|
||||
"entry,longpressed", gitem->menu);
|
||||
elm_gengrid_item_selected_set(it, EINA_FALSE);
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -94,10 +96,9 @@ _widget_longpress(void *data, Evas_Object *obj __UNUSED__, void *event_info)
|
|||
Elfe_Allapps *allapps = data;
|
||||
Elm_Object_Item *glit = event_info;
|
||||
|
||||
printf("Send widget longpressed\n");
|
||||
evas_object_smart_callback_call(allapps->box,
|
||||
"gadget,longpressed", (void*)name);
|
||||
elm_gengrid_item_selected_set(glit, EINA_FALSE);
|
||||
elm_gengrid_item_selected_set(event_info, EINA_FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -161,8 +162,6 @@ _obj_resize_cb(void *data , Evas *e __UNUSED__ , Evas_Object *obj __UNUSED__, vo
|
|||
|
||||
ow = w / (elfe_home_cfg->icon_size + w / 10);
|
||||
|
||||
printf("Nb elements : ow %d\n", ow);
|
||||
|
||||
elm_gengrid_item_size_set(allapps->grid, w / ow, (w /ow) + 20);
|
||||
|
||||
elm_gengrid_align_set(allapps->grid, 0.5, 0);
|
||||
|
@ -259,52 +258,52 @@ elfe_allapps_add(Evas_Object *parent)
|
|||
allapps->box = elm_box_add(parent);
|
||||
|
||||
/* Create buttons selector */
|
||||
allapps->selector = elm_box_add(allapps->box);
|
||||
elm_box_horizontal_set(allapps->selector, EINA_TRUE);
|
||||
/* allapps->selector = elm_box_add(allapps->box); */
|
||||
/* elm_box_horizontal_set(allapps->selector, EINA_TRUE); */
|
||||
|
||||
bt = elm_button_add(allapps->selector);
|
||||
elm_object_text_set(bt, "Apps");
|
||||
ic = elm_icon_add(bt);
|
||||
elm_image_file_set(ic, elfe_home_cfg->theme, "icon/applications");
|
||||
evas_object_show(ic);
|
||||
elm_object_content_set(bt, ic);
|
||||
evas_object_show(bt);
|
||||
elm_box_pack_end(allapps->selector, bt);
|
||||
evas_object_smart_callback_add(bt, "clicked", _apps_clicked_cb, allapps);
|
||||
allapps->buttons = eina_list_append(allapps->buttons, bt);
|
||||
/* bt = elm_button_add(allapps->selector); */
|
||||
/* elm_object_text_set(bt, "Apps"); */
|
||||
/* ic = elm_icon_add(bt); */
|
||||
/* elm_image_file_set(ic, elfe_home_cfg->theme, "icon/applications"); */
|
||||
/* evas_object_show(ic); */
|
||||
/* elm_object_content_set(bt, ic); */
|
||||
/* evas_object_show(bt); */
|
||||
/* elm_box_pack_end(allapps->selector, bt); */
|
||||
/* evas_object_smart_callback_add(bt, "clicked", _apps_clicked_cb, allapps); */
|
||||
/* allapps->buttons = eina_list_append(allapps->buttons, bt); */
|
||||
|
||||
sep = elm_separator_add(allapps->selector);
|
||||
evas_object_show(sep);
|
||||
elm_box_pack_end(allapps->selector, sep);
|
||||
/* sep = elm_separator_add(allapps->selector); */
|
||||
/* evas_object_show(sep); */
|
||||
/* elm_box_pack_end(allapps->selector, sep); */
|
||||
|
||||
bt = elm_button_add(allapps->selector);
|
||||
elm_object_text_set(bt, "Widgets");
|
||||
ic = elm_icon_add(bt);
|
||||
elm_image_file_set(ic, elfe_home_cfg->theme, "icon/widgets");
|
||||
evas_object_show(ic);
|
||||
elm_object_content_set(bt, ic);
|
||||
evas_object_show(bt);
|
||||
elm_box_pack_end(allapps->selector, bt);
|
||||
evas_object_smart_callback_add(bt, "clicked", _widgets_clicked_cb, allapps);
|
||||
allapps->buttons = eina_list_append(allapps->buttons, bt);
|
||||
/* bt = elm_button_add(allapps->selector); */
|
||||
/* elm_object_text_set(bt, "Widgets"); */
|
||||
/* ic = elm_icon_add(bt); */
|
||||
/* elm_image_file_set(ic, elfe_home_cfg->theme, "icon/widgets"); */
|
||||
/* evas_object_show(ic); */
|
||||
/* elm_object_content_set(bt, ic); */
|
||||
/* evas_object_show(bt); */
|
||||
/* elm_box_pack_end(allapps->selector, bt); */
|
||||
/* evas_object_smart_callback_add(bt, "clicked", _widgets_clicked_cb, allapps); */
|
||||
/* allapps->buttons = eina_list_append(allapps->buttons, bt); */
|
||||
|
||||
sep = elm_separator_add(allapps->selector);
|
||||
evas_object_show(sep);
|
||||
elm_box_pack_end(allapps->selector, sep);
|
||||
/* sep = elm_separator_add(allapps->selector); */
|
||||
/* evas_object_show(sep); */
|
||||
/* elm_box_pack_end(allapps->selector, sep); */
|
||||
|
||||
bt = elm_button_add(allapps->selector);
|
||||
elm_object_text_set(bt, "Config");
|
||||
ic = elm_icon_add(bt);
|
||||
elm_image_file_set(ic, elfe_home_cfg->theme, "icon/configuration");
|
||||
evas_object_show(ic);
|
||||
elm_object_content_set(bt, ic);
|
||||
evas_object_show(bt);
|
||||
elm_box_pack_end(allapps->selector, bt);
|
||||
evas_object_smart_callback_add(bt, "clicked", _config_clicked_cb, allapps);
|
||||
allapps->buttons = eina_list_append(allapps->buttons, bt);
|
||||
/* bt = elm_button_add(allapps->selector); */
|
||||
/* elm_object_text_set(bt, "Config"); */
|
||||
/* ic = elm_icon_add(bt); */
|
||||
/* elm_image_file_set(ic, elfe_home_cfg->theme, "icon/configuration"); */
|
||||
/* evas_object_show(ic); */
|
||||
/* elm_object_content_set(bt, ic); */
|
||||
/* evas_object_show(bt); */
|
||||
/* elm_box_pack_end(allapps->selector, bt); */
|
||||
/* evas_object_smart_callback_add(bt, "clicked", _config_clicked_cb, allapps); */
|
||||
/* allapps->buttons = eina_list_append(allapps->buttons, bt); */
|
||||
|
||||
evas_object_show(allapps->selector);
|
||||
elm_box_pack_end(allapps->box, allapps->selector);
|
||||
/* evas_object_show(allapps->selector); */
|
||||
/* elm_box_pack_end(allapps->box, allapps->selector); */
|
||||
|
||||
allapps->nf = elm_naviframe_add(allapps->box);
|
||||
evas_object_show(allapps->nf);
|
||||
|
|
|
@ -182,11 +182,26 @@ _cb_object_resize(void *data , Evas *e __UNUSED__, Evas_Object *obj, void *event
|
|||
static void
|
||||
_icon_mouse_move_cb(void *data,Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
|
||||
{
|
||||
Evas_Object *o_edje;
|
||||
Eina_List *l;
|
||||
Evas_Object *over;
|
||||
Elfe_Desktop *desk = data;
|
||||
Evas_Event_Mouse_Move *ev = event_info;
|
||||
|
||||
evas_object_move(desk->floating_icon, ev->cur.output.x - 92 / 2, ev->cur.output.y - 92 / 2);
|
||||
|
||||
EINA_LIST_FOREACH(desk->overs, l, over)
|
||||
{
|
||||
Evas_Coord x,y,w,h;
|
||||
o_edje = elm_layout_edje_get(over);
|
||||
evas_object_geometry_get(o_edje, &x, &y, &w, &h);
|
||||
if (ELM_RECTS_INTERSECT(x, y, w, h, ev->cur.output.x, ev->cur.output.y, 1, 1))
|
||||
edje_object_signal_emit(o_edje, "place,show", "elfe");
|
||||
else
|
||||
edje_object_signal_emit(o_edje, "place,hide", "elfe");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -228,15 +243,18 @@ _app_longpressed_cb(void *data , Evas_Object *obj, void *event_info)
|
|||
o_edje = elm_layout_edje_get(desk->layout);
|
||||
edje_object_signal_emit(o_edje, "allapps,toggle", "elfe");
|
||||
|
||||
ic = elfe_utils_fdo_icon_add(o_edje, entry->icon, size);
|
||||
|
||||
ic = elfe_utils_fdo_icon_add(desk->layout, entry->icon, size);
|
||||
evas_object_show(ic);
|
||||
evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y);
|
||||
evas_object_resize(ic, size, size);
|
||||
evas_object_move(ic, x - size / 2, y - size /2);
|
||||
desk->floating_icon = ic;
|
||||
|
||||
evas_object_del(desk->allapps);
|
||||
desk->allapps = NULL;
|
||||
evas_object_hide(desk->allapps);
|
||||
//evas_object_del(desk->allapps);
|
||||
//desk->allapps = NULL;
|
||||
|
||||
evas_object_pass_events_set(ic, EINA_TRUE);
|
||||
|
||||
desk->selected_app = entry;
|
||||
|
@ -544,6 +562,7 @@ elfe_desktop_edit_mode_set(Evas_Object *obj, Eina_Bool mode)
|
|||
|
||||
evas_object_resize(o_edje, m, n);
|
||||
evas_object_move(o_edje, x + i*m, y + j*n);
|
||||
evas_object_raise(o_edje);
|
||||
evas_object_show(over);
|
||||
desk->overs = eina_list_append(desk->overs, over);
|
||||
}
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
typedef struct _Elfe_Desktop_Item Elfe_Desktop_Item;
|
||||
struct _Elfe_Desktop_Item
|
||||
{
|
||||
Evas_Object *parent;
|
||||
Evas_Object *frame;
|
||||
Evas_Object *item;
|
||||
Evas_Object *icon;
|
||||
|
@ -98,7 +99,7 @@ _app_add(Elfe_Desktop_Item *dit, const char *name __UNUSED__)
|
|||
item = edje_object_add(evas_object_evas_get(dit->frame));
|
||||
edje_object_file_set(item, elfe_home_cfg->theme, "elfe/desktop/app/frame");
|
||||
|
||||
icon = elfe_utils_fdo_icon_add(dit->frame, dit->desktop->icon, elfe_home_cfg->icon_size);
|
||||
icon = elfe_utils_fdo_icon_add(dit->parent, dit->desktop->icon, elfe_home_cfg->icon_size);
|
||||
//evas_object_size_hint_min_set(icon, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size);
|
||||
evas_object_size_hint_max_set(icon, elfe_home_cfg->icon_size, elfe_home_cfg->icon_size);
|
||||
|
||||
|
@ -210,6 +211,8 @@ elfe_desktop_item_add(Evas_Object *parent,
|
|||
if (!dit)
|
||||
return NULL;
|
||||
|
||||
dit->parent = parent;
|
||||
|
||||
dit->row = row;
|
||||
dit->col = col;
|
||||
|
||||
|
@ -217,13 +220,12 @@ elfe_desktop_item_add(Evas_Object *parent,
|
|||
edje_object_file_set(layout, elfe_home_cfg->theme, "elfe/desktop/frame");
|
||||
|
||||
dit->frame = layout;
|
||||
printf("ITEM ADD %s\n", name);
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case ELFE_DESKTOP_ITEM_APP:
|
||||
dit->desktop = efreet_desktop_get(name);
|
||||
|
||||
|
||||
if (!dit->desktop)
|
||||
{
|
||||
printf("ERROR unable to get efreet desktop from %s\n", name);
|
||||
|
|
|
@ -167,7 +167,7 @@ _populate_page(Elfe_Desktop_Page *page)
|
|||
if (eina_matrixsparse_data_idx_get(page->items, dic->row, dic->col))
|
||||
continue;
|
||||
|
||||
item = elfe_desktop_item_add(page->layout, dic->row, dic->col,
|
||||
item = elfe_desktop_item_add(page->parent, dic->row, dic->col,
|
||||
dic->name, dic->type, page->gc);
|
||||
if (!item)
|
||||
continue;
|
||||
|
@ -244,7 +244,7 @@ elfe_desktop_page_item_gadget_add(Evas_Object *obj, const char *name,
|
|||
/* This position is already used by another item! */
|
||||
if (eina_matrixsparse_data_idx_get(page->items, row, col)) return;
|
||||
|
||||
item = elfe_desktop_item_add(page->layout, row, col,
|
||||
item = elfe_desktop_item_add(page->parent, row, col,
|
||||
name,
|
||||
ELFE_DESKTOP_ITEM_GADGET, page->gc);
|
||||
e_layout_pack(page->layout, item);
|
||||
|
@ -277,7 +277,7 @@ elfe_desktop_page_item_app_add(Evas_Object *obj, Efreet_Menu *menu,
|
|||
/* This position is already used by another item! */
|
||||
if (eina_matrixsparse_data_idx_get(page->items, row, col)) return;
|
||||
|
||||
item = elfe_desktop_item_add(page->layout, row, col,
|
||||
item = elfe_desktop_item_add(page->parent, row, col,
|
||||
menu->desktop->orig_path,
|
||||
ELFE_DESKTOP_ITEM_APP, NULL);
|
||||
e_layout_pack(page->layout, item);
|
||||
|
|
|
@ -162,13 +162,10 @@ elfe_gadgets_app_add(Evas_Object *obj, Efreet_Menu *app, Evas_Coord x, Evas_Coor
|
|||
|
||||
ic = elfe_utils_fdo_icon_add(obj, app->icon, MIN(w,h));
|
||||
evas_object_show(ic);
|
||||
printf("App name : %s\n", app->name);
|
||||
|
||||
ly = _item_add(egad, ELFE_DESKTOP_ITEM_APP, app->icon, ic, m, n, pos_x, pos_y, w, h);
|
||||
if (ly)
|
||||
{
|
||||
elfe_home_config_desktop_item_add(egad->desktop, ELFE_DESKTOP_ITEM_APP, m, n, pos_x, pos_y, w, h, app->desktop->orig_path);
|
||||
printf("Desktop path : %s\n", app->desktop->orig_path);
|
||||
}
|
||||
else
|
||||
return;
|
||||
|
||||
|
@ -196,10 +193,6 @@ _object_resize_cb(void *data , Evas *e , Evas_Object *obj, void *event_info )
|
|||
|
||||
evas_object_geometry_get(egad->layout, &x, &y, &w, &h);
|
||||
e_layout_virtual_size_set(egad->layout, w, h);
|
||||
printf("%d %d %d %d\n", x, y, w, h);
|
||||
|
||||
|
||||
|
||||
evas_object_show(egad->layout);
|
||||
}
|
||||
|
||||
|
@ -306,11 +299,6 @@ elfe_gadgets_zone_add(Evas_Object *parent, E_Zone *zone, int desktop, const char
|
|||
break;
|
||||
}
|
||||
|
||||
printf("%p %d %d %d %d %d %d\n", child, dic->col, dic->row,
|
||||
dic->pos_x, dic->pos_y,
|
||||
dic->size_w, dic->size_h);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -234,7 +234,6 @@ _elfe_home_win_new(E_Zone *zone)
|
|||
static void
|
||||
_elfe_home_win_cb_free(Elfe_Home_Win *hwin)
|
||||
{
|
||||
printf("CB FREE\n");
|
||||
if (hwin->win->evas_win) e_drop_xdnd_register_set(hwin->win->evas_win, 0);
|
||||
if (hwin->o_bg) evas_object_del(hwin->o_bg);
|
||||
if (hwin->layout) evas_object_del(hwin->layout);
|
||||
|
@ -248,7 +247,7 @@ _elfe_home_win_cb_resize(E_Win *win)
|
|||
Elfe_Home_Win *hwin;
|
||||
Evas_Coord w, h;
|
||||
if (!(hwin = win->data)) return;
|
||||
if (hwin->o_bg)
|
||||
if (hwin->o_bg)
|
||||
{
|
||||
evas_object_size_hint_min_set(hwin->o_bg, win->w, win->h);
|
||||
edje_object_parts_extends_calc(hwin->o_bg, NULL, NULL, &w, &h);
|
||||
|
|
Loading…
Reference in New Issue