static void _bstatus(void *data, Evas_Object *obj, void *event_info);
static void _tstatus(void *data, Evas_Object *obj, void *event_info);
-static char *_label_get(void *data, Evas_Object *obj, const char *source);
-static Evas_Object *_icon_get(void *data, Evas_Object *obj, const char *source);
+static char *_text_get(void *data, Evas_Object *obj, const char *source);
+static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *source);
static Eina_Bool _state_get(void *data, Evas_Object *obj, const char *source);
static void _item_del(void *data, Evas_Object *obj);
static void _fill_list(Evas_Object *obj);
static void
_tstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
- Elm_Toolbar_Item *sel;
+ Elm_Object_Item *tb_it;
const char *status;
if (elm_panel_hidden_get((Evas_Object*)data))
else
status = "shown";
printf("The top panel is currently %s\n", status);
- sel = elm_toolbar_selected_item_get(obj);
- elm_toolbar_item_selected_set(sel, EINA_FALSE);
+ tb_it = elm_toolbar_selected_item_get(obj);
+ elm_toolbar_item_selected_set(tb_it, EINA_FALSE);
}
static void
_bstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
- Elm_Toolbar_Item *sel;
+ Elm_Object_Item *tb_it;
const char *status;
if (elm_panel_hidden_get((Evas_Object*)data))
else
status = "shown";
printf("The bottom panel is currently %s\n", status);
- sel = elm_toolbar_selected_item_get(obj);
- elm_toolbar_item_selected_set(sel, EINA_FALSE);
+ tb_it = elm_toolbar_selected_item_get(obj);
+ elm_toolbar_item_selected_set(tb_it, EINA_FALSE);
}
static char *
-_label_get(void *data, Evas_Object *obj __UNUSED__, const char *source __UNUSED__)
+_text_get(void *data, Evas_Object *obj __UNUSED__, const char *source __UNUSED__)
{
return strdup(ecore_file_file_get(data));
}
static Evas_Object *
-_icon_get(void *data, Evas_Object *obj, const char *source)
+_content_get(void *data, Evas_Object *obj, const char *source)
{
- if (!strcmp(source, "elm.swallow.icon"))
+ if (!strcmp(source, "elm.swallow.icon"))
{
Evas_Object *ic;
return NULL;
}
-static Eina_Bool
-_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *source __UNUSED__)
+static Eina_Bool
+_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *source __UNUSED__)
{
return EINA_FALSE;
}
-static void
-_item_del(void *data, Evas_Object *obj __UNUSED__)
+static void
+_item_del(void *data, Evas_Object *obj __UNUSED__)
{
eina_stringshare_del(data);
}
-static void
-_fill_list(Evas_Object *obj)
+static void
+_fill_list(Evas_Object *obj)
{
DIR *d;
struct dirent *de;
char *real;
if (!(d = opendir(getenv("HOME")))) return;
- while ((de = readdir(d)))
+ while ((de = readdir(d)))
{
char buff[PATH_MAX];
dirs = eina_list_sort(dirs, eina_list_count(dirs), EINA_COMPARE_CB(strcoll));
- EINA_LIST_FOREACH(dirs, l, real)
+ EINA_LIST_FOREACH(dirs, l, real)
{
Eina_Bool result = EINA_FALSE;
result = _dir_has_subs(real);
- if (!result)
- elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
+ if (!result)
+ elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
- else
- elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
- NULL, ELM_GENLIST_ITEM_SUBITEMS,
+ else
+ elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
+ NULL, ELM_GENLIST_ITEM_SUBITEMS,
NULL, NULL);
free(real);
}
eina_list_free(dirs);
}
-static Eina_Bool
-_dir_has_subs(const char *path)
+static Eina_Bool
+_dir_has_subs(const char *path)
{
DIR *d;
struct dirent *de;
if (!path) return result;
if (!(d = opendir(path))) return result;
- while ((de = readdir(d)))
+ while ((de = readdir(d)))
{
char buff[PATH_MAX];
if (de->d_name[0] == '.') continue;
snprintf(buff, sizeof(buff), "%s/%s", path, de->d_name);
- if (ecore_file_is_dir(buff))
+ if (ecore_file_is_dir(buff))
{
result = EINA_TRUE;
break;
win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
elm_win_title_set(win, "Panel");
- elm_win_autodel_set(win, 1);
+ elm_win_autodel_set(win, EINA_TRUE);
bg = elm_bg_add(win);
elm_win_resize_object_add(win, bg);
evas_object_size_hint_align_set(panel, EVAS_HINT_FILL, EVAS_HINT_FILL);
toolbar = elm_toolbar_add(win);
- elm_toolbar_homogenous_set(toolbar, 0);
+ elm_toolbar_homogeneous_set(toolbar, 0);
elm_toolbar_mode_shrink_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_toolbar_item_append(toolbar, "home", "Hello", _tstatus, panel);
- elm_panel_content_set(panel, toolbar);
+ elm_object_content_set(panel, toolbar);
elm_box_pack_end(vbx, panel);
evas_object_show(panel);
evas_object_size_hint_align_set(panel, 0, EVAS_HINT_FILL);
itc.item_style = "default";
- itc.func.label_get = _label_get;
- itc.func.icon_get = _icon_get;
+ itc.func.text_get = _text_get;
+ itc.func.content_get = _content_get;
itc.func.state_get = _state_get;
itc.func.del = _item_del;
evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(list);
- elm_panel_content_set(panel, list);
+ elm_object_content_set(panel, list);
elm_box_pack_end(bx, panel);
evas_object_show(panel);
evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(list);
- elm_panel_content_set(panel, list);
+ elm_object_content_set(panel, list);
elm_box_pack_end(bx, panel);
evas_object_show(panel);
elm_panel_hidden_set(panel, EINA_TRUE);
toolbar = elm_toolbar_add(win);
- elm_toolbar_homogenous_set(toolbar, 0);
+ elm_toolbar_homogeneous_set(toolbar, 0);
elm_toolbar_mode_shrink_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_toolbar_item_append(toolbar, "home", "Hello", _bstatus, panel);
- elm_panel_content_set(panel, toolbar);
+ elm_object_content_set(panel, toolbar);
elm_box_pack_end(vbx, panel);
evas_object_show(panel);