forked from enlightenment/enlightenment
remove ability to alter gadgets in EFM toolbars
this whole site as a "fully functioning gadcon" is pretty broken (by design), and it's not worthwhile to fix it at this point
This commit is contained in:
parent
b8af219a77
commit
842d830c39
|
@ -1,3 +1,8 @@
|
|||
2013-12-04 Mike Blumenkrantz
|
||||
|
||||
* Fixed NoDisplay entries in Everything launcher
|
||||
* Removed capabilities to alter gadgets in EFM toolbars
|
||||
|
||||
2013-11-25 Tom Hacohen
|
||||
|
||||
* Entry: Fixed issues with entry not scrolling to cursor.
|
||||
|
|
2
NEWS
2
NEWS
|
@ -81,6 +81,7 @@ Removed:
|
|||
* e_manager_comp namespace
|
||||
* HAL support for filemanager
|
||||
* "raise on focus" config option
|
||||
* ability to alter gadgets in EFM toolbars
|
||||
|
||||
Improvements:
|
||||
* mixer shows more channels when using alsa subsystem and correctly disable controls
|
||||
|
@ -236,3 +237,4 @@ Fixes:
|
|||
* fixed catching XWindow closes during DND operations on those windows
|
||||
* wsod: Fixed gdb hangs when generating backtraces.
|
||||
* Entry: Fixed issues with entry not scrolling to cursor.
|
||||
* Fixed NoDisplay entries in Everything launcher
|
||||
|
|
|
@ -1661,8 +1661,8 @@ _e_gadcon_gadget_move_to_pre_cb(void *data, E_Menu *m)
|
|||
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_DESKTOP, &n);
|
||||
if (!gcc->client_class->func.is_site || gcc->client_class->func.is_site(E_GADCON_SITE_TOOLBAR))
|
||||
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_TOOLBAR, &n);
|
||||
if (!gcc->client_class->func.is_site || gcc->client_class->func.is_site(E_GADCON_SITE_EFM_TOOLBAR))
|
||||
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_EFM_TOOLBAR, &n);
|
||||
//if (!gcc->client_class->func.is_site || gcc->client_class->func.is_site(E_GADCON_SITE_EFM_TOOLBAR))
|
||||
//_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_EFM_TOOLBAR, &n);
|
||||
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_UNKNOWN, &n);
|
||||
}
|
||||
|
||||
|
@ -1722,7 +1722,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget
|
|||
e_menu_post_deactivate_callback_set(menu_main, _e_gadcon_client_cb_menu_post, gcc);
|
||||
gcc->menu = menu_main;
|
||||
|
||||
if ((gcc->gadcon->shelf) || (gcc->gadcon->toolbar))
|
||||
if (gcc->gadcon->shelf)
|
||||
{
|
||||
if (e_menu_item_nth(menu_gadget, 0))
|
||||
{
|
||||
|
@ -1803,7 +1803,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget
|
|||
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc);
|
||||
}
|
||||
|
||||
if (!e_config->menu_gadcon_client_toplevel)
|
||||
if ((!e_config->menu_gadcon_client_toplevel) && (!gcc->gadcon->toolbar))
|
||||
{
|
||||
mi = e_menu_item_new(menu_main);
|
||||
if (gcc->client_class->func.label)
|
||||
|
|
|
@ -6,9 +6,9 @@ static void _e_toolbar_cb_mouse_down(void *data, Evas *evas, Evas_Object
|
|||
static void _e_toolbar_menu_cb_post(void *data, E_Menu *mn);
|
||||
static void _e_toolbar_menu_cb_pre(void *data, E_Menu *mn);
|
||||
static void _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn);
|
||||
static void _e_toolbar_menu_cb_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||
//static void _e_toolbar_menu_cb_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||
static void _e_toolbar_menu_cb_config(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||
static void _e_toolbar_menu_cb_contents(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||
//static void _e_toolbar_menu_cb_contents(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||
static void _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
||||
static const char *_e_toolbar_orient_string_get(E_Toolbar *tbar);
|
||||
static void _e_toolbar_fm2_changed(void *data, Evas_Object *obj, void *event_info);
|
||||
|
@ -31,7 +31,7 @@ _tb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *info __UNUSED
|
|||
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
|
||||
if (tbar->gadcon) e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
|
||||
}
|
||||
|
||||
/*
|
||||
static void
|
||||
_e_toolbar_gadget_remove(void *data EINA_UNUSED, E_Gadcon_Client *gcc)
|
||||
{
|
||||
|
@ -121,13 +121,14 @@ _e_toolbar_gadget_add(void *data EINA_UNUSED, E_Gadcon_Client *gcc, const E_Gadc
|
|||
e_config_save_queue();
|
||||
return (gc || gcc);
|
||||
}
|
||||
|
||||
*/
|
||||
EINTERN int
|
||||
e_toolbar_init(void)
|
||||
{
|
||||
tb_location = e_gadcon_location_new(_("EFM Toolbar"), E_GADCON_SITE_EFM_TOOLBAR,
|
||||
_e_toolbar_gadget_add, NULL,
|
||||
_e_toolbar_gadget_remove, NULL);
|
||||
NULL, NULL, NULL, NULL);
|
||||
//_e_toolbar_gadget_add, NULL,
|
||||
//_e_toolbar_gadget_remove, NULL);
|
||||
e_gadcon_location_set_icon_name(tb_location, "configure-toolbars");
|
||||
e_gadcon_location_register(tb_location);
|
||||
return 1;
|
||||
|
@ -337,27 +338,28 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
|
|||
|
||||
tbar = data;
|
||||
e_menu_pre_activate_callback_set(mn, NULL, NULL);
|
||||
|
||||
/*
|
||||
mi = e_menu_item_new(mn);
|
||||
if (tbar->gadcon->editing)
|
||||
e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
|
||||
e_menu_item_label_set(mi, _("Stop Moving Items"));
|
||||
else
|
||||
e_menu_item_label_set(mi, _("Begin Moving/Resizing Items"));
|
||||
e_menu_item_label_set(mi, _("Begin Moving Items"));
|
||||
e_util_menu_item_theme_icon_set(mi, "transform-scale");
|
||||
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_edit, tbar);
|
||||
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
|
||||
*/
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_label_set(mi, _("Toolbar Settings"));
|
||||
e_util_menu_item_theme_icon_set(mi, "configure");
|
||||
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_config, tbar);
|
||||
|
||||
/*
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_label_set(mi, _("Set Toolbar Contents"));
|
||||
e_util_menu_item_theme_icon_set(mi, "preferences-toolbar");
|
||||
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_contents, tbar);
|
||||
*/
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -383,7 +385,7 @@ _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn)
|
|||
e_menu_item_submenu_set(mi, subm);
|
||||
e_object_unref(E_OBJECT(subm));
|
||||
}
|
||||
|
||||
/*
|
||||
static void
|
||||
_e_toolbar_menu_cb_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
|
@ -395,7 +397,7 @@ _e_toolbar_menu_cb_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNU
|
|||
else
|
||||
e_gadcon_edit_begin(tbar->gadcon);
|
||||
}
|
||||
|
||||
*/
|
||||
static void
|
||||
_e_toolbar_menu_cb_config(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
|
@ -404,7 +406,7 @@ _e_toolbar_menu_cb_config(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __U
|
|||
tbar = data;
|
||||
if (!tbar->cfg_dlg) e_int_toolbar_config(tbar);
|
||||
}
|
||||
|
||||
/*
|
||||
static void
|
||||
_e_toolbar_menu_cb_contents(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
|
@ -413,7 +415,7 @@ _e_toolbar_menu_cb_contents(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi _
|
|||
tbar = data;
|
||||
if (!tbar->gadcon->config_dialog) e_int_gadcon_config_toolbar(tbar->gadcon);
|
||||
}
|
||||
|
||||
*/
|
||||
static void
|
||||
_e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue