forked from enlightenment/enlightenment
'everything'
- lower priority for 'text' items - show plugin icons in aggregator and selector when there are no item icons SVN revision: 47217
This commit is contained in:
parent
8b2dbb866d
commit
4104105380
|
@ -247,8 +247,9 @@ evry_clear_input(void)
|
|||
}
|
||||
}
|
||||
|
||||
//#define CHECK_REFS 1
|
||||
|
||||
#ifdef CECHK_REFS
|
||||
#ifdef CHECK_REFS
|
||||
static int item_cnt = 0;
|
||||
#endif
|
||||
|
||||
|
@ -423,6 +424,10 @@ evry_plugin_async_update(Evry_Plugin *p, int action)
|
|||
|
||||
_evry_view_update(s, NULL);
|
||||
}
|
||||
else if (action == EVRY_ASYNC_UPDATE_CLEAR)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -781,11 +786,11 @@ _evry_selector_icon_set(Evry_Selector *sel)
|
|||
|
||||
it = s->cur_item;
|
||||
|
||||
if (it && it->plugin && it->plugin->icon_get)
|
||||
if (s->plugin && s->plugin->icon_get)
|
||||
{
|
||||
if (!_evry_selector_thumb(sel, it))
|
||||
{
|
||||
o = it->plugin->icon_get(it->plugin, it, win->popup->evas);
|
||||
o = s->plugin->icon_get(it->plugin, it, win->popup->evas);
|
||||
if (o)
|
||||
{
|
||||
edje_object_part_swallow(sel->o_main, "e.swallow.icons", o);
|
||||
|
|
|
@ -224,10 +224,17 @@ _cleanup(Evry_Plugin *plugin)
|
|||
static Evas_Object *
|
||||
_icon_get(Evry_Plugin *plugin, const Evry_Item *it, Evas *e)
|
||||
{
|
||||
if (it->plugin && it->plugin->icon_get)
|
||||
return it->plugin->icon_get(it->plugin, it, e);
|
||||
Evas_Object *o = NULL;
|
||||
|
||||
return NULL;
|
||||
if (it->plugin)
|
||||
{
|
||||
if (it->plugin->icon_get)
|
||||
o = it->plugin->icon_get(it->plugin, it, e);
|
||||
else if (it->plugin->icon)
|
||||
o = evry_icon_theme_get(it->plugin->icon, e);
|
||||
}
|
||||
|
||||
return o;
|
||||
}
|
||||
|
||||
Evry_Plugin *
|
||||
|
|
|
@ -21,6 +21,7 @@ _fetch(Evry_Plugin *p, const char *input)
|
|||
if (input)
|
||||
{
|
||||
it = evry_item_new(NULL, p, input, NULL);
|
||||
it->fuzzy_match = 9999;
|
||||
EVRY_PLUGIN_ITEM_APPEND(p, it);
|
||||
|
||||
return 1;
|
||||
|
@ -32,14 +33,14 @@ _fetch(Evry_Plugin *p, const char *input)
|
|||
static Eina_Bool
|
||||
_init(void)
|
||||
{
|
||||
p1 = evry_plugin_new(NULL, "Text", type_subject, NULL, "TEXT", 1, "accessories-editor", NULL,
|
||||
p1 = evry_plugin_new(NULL, "Text", type_subject, NULL, "TEXT", 1, "accessories-text-editor", NULL,
|
||||
NULL, _cleanup, _fetch, NULL, NULL, NULL, NULL);
|
||||
|
||||
p2 = evry_plugin_new(NULL, "Text", type_object, NULL, "TEXT", 1, "accessories-editor", NULL,
|
||||
p2 = evry_plugin_new(NULL, "Text", type_object, NULL, "TEXT", 1, "accessories-text-editor", NULL,
|
||||
NULL, _cleanup, _fetch, NULL, NULL, NULL, NULL);
|
||||
|
||||
evry_plugin_register(p1, 10);
|
||||
evry_plugin_register(p2, 10);
|
||||
evry_plugin_register(p1, 100);
|
||||
evry_plugin_register(p2, 100);
|
||||
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
|
|
@ -489,7 +489,7 @@ _get_name_owner(void *data __UNUSED__, DBusMessage *msg, DBusError *err)
|
|||
if (dbus_error_is_set(err))
|
||||
{
|
||||
ERR("request name error: %s", err->message);
|
||||
dbus_error_free(err);
|
||||
//dbus_error_free(err);
|
||||
e_dbus_connection_close(conn);
|
||||
conn = NULL;
|
||||
return;
|
||||
|
|
|
@ -300,9 +300,9 @@ _e_smart_reconfigure_do(void *data)
|
|||
}
|
||||
|
||||
if (!it->image && !it->have_thumb &&
|
||||
it->item->plugin && it->item->plugin->icon_get)
|
||||
sd->view->state->plugin->icon_get)
|
||||
{
|
||||
it->image = it->item->plugin->icon_get
|
||||
it->image = sd->view->state->plugin->icon_get
|
||||
(it->item->plugin, it->item, sd->view->evas);
|
||||
|
||||
if (it->image)
|
||||
|
|
Loading…
Reference in New Issue