From b4ed410b9133c692fc20171ef3061f8b0b912d95 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 21 Jan 2016 12:28:42 +1000 Subject: Evil hack around ELM's problem with lack of toolbar item icons. --- src/extantz/extantz.c | 10 +++++----- src/extantz/woMan.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/extantz') diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 1091c87..07e6502 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -461,11 +461,11 @@ static winFang *_makeMainMenu(globals *ourGlobals) makeMainMenuFinish(me, tb); // Other stuff in the toolbar. - it = elm_toolbar_item_append(tb, NULL, "restriction icons", NULL, NULL); - it = elm_toolbar_item_append(tb, NULL, NULL, NULL, NULL); elm_toolbar_item_separator_set(it, EINA_TRUE); - it = elm_toolbar_item_append(tb, NULL, "hop://localhost/Anarchadia 152, 155, 51 - Lost plot (Adult)", NULL, NULL); - it = elm_toolbar_item_append(tb, NULL, NULL, NULL, NULL); elm_toolbar_item_separator_set(it, EINA_TRUE); - it = elm_toolbar_item_append(tb, NULL, "date time:o'clock", NULL, NULL); + it = elm_toolbar_item_append(tb, NoIcon, "restriction icons", NULL, NULL); + it = elm_toolbar_item_append(tb, NoIcon, NULL, NULL, NULL); elm_toolbar_item_separator_set(it, EINA_TRUE); + it = elm_toolbar_item_append(tb, NoIcon, "hop://localhost/Anarchadia 152, 155, 51 - Lost plot (Adult)", NULL, NULL); + it = elm_toolbar_item_append(tb, NoIcon, NULL, NULL, NULL); elm_toolbar_item_separator_set(it, EINA_TRUE); + it = elm_toolbar_item_append(tb, NoIcon, "date time:o'clock", NULL, NULL); elm_layout_box_prepend(me->layout, WF_BOX, tb); diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 42390cc..c867241 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c @@ -250,10 +250,10 @@ winFang *woMan_add(globals *ourGlobals) evas_object_show(nf); sprintf(buf, "%s/%s", prefix_data_get(), img3); - tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it); + tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NoIcon, "Viewers", _promote, tab_it); // TODO - This strdup leaks, but this is just temporary test code anyway, it will go away. - tab = _content_image_new(me->win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it); - tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it); + tab = _content_image_new(me->win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NoIcon, "Landmarks", _promote, tab_it); + tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NoIcon, "Grids", _promote, tab_it); elm_layout_box_append(me->win, WF_BOX, nf); bt = eo_add(ELM_BUTTON_CLASS, me->win, -- cgit v1.1