forked from enlightenment/enlightenment
streamline gadget menu to move move item to main menu.
SVN revision: 75407
This commit is contained in:
parent
e1747818c4
commit
40a67e9222
|
@ -1328,7 +1328,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable)
|
||||
e_gadcon_client_resizable_set(E_Gadcon_Client *gcc __UNUSED__, int resizable __UNUSED__)
|
||||
{
|
||||
E_OBJECT_CHECK(gcc);
|
||||
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
|
||||
|
@ -1369,8 +1369,6 @@ e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable)
|
|||
}
|
||||
}
|
||||
*/
|
||||
resizable = 0;
|
||||
gcc = NULL;
|
||||
}
|
||||
|
||||
EAPI int
|
||||
|
@ -1590,6 +1588,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget
|
|||
mi = e_menu_item_new(menu_gadget);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
}
|
||||
/*
|
||||
if (!gcc->o_control)
|
||||
{
|
||||
mi = e_menu_item_new(menu_gadget);
|
||||
|
@ -1597,7 +1596,6 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget
|
|||
e_util_menu_item_theme_icon_set(mi, "transform-scale");
|
||||
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
|
||||
}
|
||||
/*
|
||||
mi = e_menu_item_new(menu_gadget);
|
||||
e_menu_item_label_set(mi, _("Resizeable"));
|
||||
e_util_menu_item_theme_icon_set(mi, "transform-scale");
|
||||
|
@ -2889,6 +2887,14 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj
|
|||
cy + ev->output.y, 1, 1,
|
||||
E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
|
||||
}
|
||||
else if (ev->button == 2)
|
||||
{
|
||||
if (gcc->instant_edit_timer)
|
||||
ecore_timer_del(gcc->instant_edit_timer);
|
||||
gcc->instant_edit_timer = NULL;
|
||||
e_gadcon_client_edit_begin(gcc);
|
||||
_e_gadcon_client_move_start(gcc);
|
||||
}
|
||||
else if (ev->button == 1)
|
||||
{
|
||||
if ((!gcc->o_control) && (gcc->gadcon->instant_edit))
|
||||
|
@ -2923,6 +2929,14 @@ _e_gadcon_client_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __
|
|||
e_gadcon_client_edit_end(gcc);
|
||||
}
|
||||
}
|
||||
else if (ev->button == 2)
|
||||
{
|
||||
if (gcc->o_control)
|
||||
{
|
||||
_e_gadcon_client_move_stop(gcc);
|
||||
e_gadcon_client_edit_end(gcc);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -1372,6 +1372,17 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
|
|||
e_object_free_attach_func_set(E_OBJECT(mi), _e_shelf_menu_item_free);
|
||||
e_object_data_set(E_OBJECT(mi), es);
|
||||
e_menu_item_submenu_set(mi, subm);
|
||||
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
|
||||
mi = e_menu_item_new(mn);
|
||||
if (es->gadcon->editing)
|
||||
e_menu_item_label_set(mi, _("Stop Moving Gadgets"));
|
||||
else
|
||||
e_menu_item_label_set(mi, _("Begin Moving Gadgets"));
|
||||
e_util_menu_item_theme_icon_set(mi, "transform-scale");
|
||||
e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1968,17 +1979,6 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
|
|||
es = data;
|
||||
e_menu_pre_activate_callback_set(m, NULL, NULL);
|
||||
|
||||
mi = e_menu_item_new(m);
|
||||
if (es->gadcon->editing)
|
||||
e_menu_item_label_set(mi, _("Stop Moving Gadgets"));
|
||||
else
|
||||
e_menu_item_label_set(mi, _("Begin Moving Gadgets"));
|
||||
e_util_menu_item_theme_icon_set(mi, "transform-scale");
|
||||
e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es);
|
||||
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, _("Contents"));
|
||||
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
|
||||
|
|
Loading…
Reference in New Issue