Some active guys changed build errors.
So i re-summit patch
On Fri, Mar 9, 2012 at 3:23 PM, Hyoyoung Chang <hyoyo...@gmail.com> wrote:
> Dear all,
>
> After elm radically changed, some compilation errors are not fixed.
> I changed for this.
>
> 1. add a parameter for item_bring_in
> -elm_genlist_item_bring_in(it);
> +elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_IN);
>
> 2. change a enum type name
> - Elm_Genlist_Item_Flags
> + Elm_Genlist_Item_Type
>
> 3. change a enum name
> - if (!parent) flags = ELM_GENLIST_ITEM_SUBITEMS;
> + if (!parent) flags = ELM_GENLIST_ITEM_TREE;
>
> affected file list:
> PROTO/enna-explorer/src/bin/shortcut.c
> PROTO/ev/ev.c
> editje/editje/filewizard.py
> envision/src/bin/main.c
> BINDINGS/python/python-elementary/elementary/__init__.py
> BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_panel.cpp
> BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_genlist.cpp
> BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h
> BINDINGS/cxx/elementaryxx/src/GenList.cpp
> BINDINGS/cxx/elementaryxx/src/GenListItem.cpp
> BINDINGS/perl/t/elementary_test.t
> BINDINGS/perl/Elementary/Makefile.PL
> BINDINGS/perl/Elementary/Elementary.xs
> BINDINGS/perl/lib/EFL/Elementary.pm
> ensure/src/errors.c
> ensure/src/entree.c
> ensure/src/enconfig.c
> clouseau/src/lib/libclouseau.c
> clouseau/src/lib/ui/obj_information.c
> enki/src/bin/evas_object/enki_elm_genlist_tree.c
>
> Thanks.
Index: PROTO/enna-explorer/src/bin/shortcut.c
===================================================================
--- PROTO/enna-explorer/src/bin/shortcut.c (리비전 69282)
+++ PROTO/enna-explorer/src/bin/shortcut.c (작업 사본)
@@ -564,7 +564,7 @@ enna_shortcut_add(Evas_Object *parent)
egi = elm_genlist_item_append(list, &itc_favorite_group, "DEVICES", NULL,
- ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+ ELM_GENLIST_ITEM_TREE, NULL, NULL);
evas_object_data_set(list, "devices/item", egi);
evas_object_data_set(list, "items", egi);
@@ -600,10 +600,10 @@ enna_shortcut_add(Evas_Object *parent)
egi = elm_genlist_item_append(list, &itc_favorite_group, "NETWORK", NULL,
- ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+ ELM_GENLIST_ITEM_TREE, NULL, NULL);
egi = elm_genlist_item_append(list, &itc_favorite_group, "PLACES", NULL,
- ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+ ELM_GENLIST_ITEM_TREE, NULL, NULL);
gtk_bookmarks = _enna_shortcut_parse_gtk_bookmarks();
EINA_LIST_FREE(gtk_bookmarks, file)
Index: PROTO/ev/ev.c
===================================================================
--- PROTO/ev/ev.c (리비전 69282)
+++ PROTO/ev/ev.c (작업 사본)
@@ -103,7 +103,7 @@ _key(void *data __UNUSED__, Evas *e __UNUSED__, Ev
if (!it) it = elm_genlist_first_item_get(list);
DBG("next: %p", it);
elm_genlist_item_selected_set(it, EINA_TRUE);
- elm_genlist_item_bring_in(it);
+ elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_IN);
_pick(NULL, NULL, it);
}
else if ((!strcmp(key->keyname, "Return")) || (!strcmp(key->keyname,
"KP_Enter")))
@@ -111,7 +111,7 @@ _key(void *data __UNUSED__, Evas *e __UNUSED__, Ev
if (obj == elm_object_parent_widget_get(img)) return;
it = elm_genlist_selected_item_get(list);
if (!it) return;
- elm_genlist_item_bring_in(it);
+ elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_IN);
_pick(NULL, NULL, it);
}
else if (key->keyname[0] == 'q')
Index: editje/editje/filewizard.py
===================================================================
--- editje/editje/filewizard.py (리비전 69282)
+++ editje/editje/filewizard.py (작업 사본)
@@ -297,7 +297,7 @@ class FontSelectionWizard(FileSelectionWizard):
self._files += self._system_fonts
self._file_list.item_append(itc, message, None,
- elementary.ELM_GENLIST_ITEM_SUBITEMS, self._expand_cb)
+ elementary.ELM_GENLIST_ITEM_TREE, self._expand_cb)
def _expand_cb(self, obj, part, item_data):
if obj.expanded:
Index: envision/src/bin/main.c
===================================================================
--- envision/src/bin/main.c (리비전 69282)
+++ envision/src/bin/main.c (작업 사본)
@@ -241,7 +241,7 @@ grid_changed(void *data,
App *app = data;
if (!app->bring_in_cur_page) return;
app->bring_in_cur_page = EINA_FALSE;
- elm_gengrid_item_bring_in(app->current_item_page);
+ elm_gengrid_item_bring_in(app->current_item_page,
ELM_GENGRID_ITEM_SCROLLTO_IN);
}
/*---------------------CONTENT GET - RENDER PDF-------------------------*/
@@ -340,7 +340,7 @@ grid_item_db_double_clicked(void *data,
app->current_item_page = event_info;
app->bring_in_cur_page = EINA_TRUE;
page_view_mode_set((App *)data, WINDOW_WIDTH);
- elm_gengrid_item_bring_in(app->current_item_page);
+ elm_gengrid_item_bring_in(app->current_item_page,
ELM_GENGRID_ITEM_SCROLLTO_IN);
}
/*--------------------------ZOOM IN CB-------------------------------*/
@@ -371,7 +371,7 @@ _zoom_in(void *data, Evas_Object *obj __UNUSED__,
if (app->update_job) ecore_job_del(app->update_job);
app->update_job = ecore_job_add(_update_items, app);
- elm_gengrid_item_show(app->current_item_page);
+ elm_gengrid_item_show(app->current_item_page, ELM_GENGRID_ITEM_SCROLLTO_IN);
}
/*--------------------------ZOOM OUT CB------------------------------*/
@@ -416,7 +416,7 @@ _page_up(void *data, Evas_Object *obj __UNUSED__,
if (!prev)
return;
elm_gengrid_item_selected_set(prev, EINA_TRUE);
- elm_gengrid_item_show(prev);
+ elm_gengrid_item_show(prev, ELM_GENGRID_ITEM_SCROLLTO_IN);
}
/*--------------------------PAGE_DOWN CB-------------------------------*/
@@ -433,7 +433,7 @@ _page_down(void *data, Evas_Object *obj __UNUSED__
if (!next)
return;
elm_gengrid_item_selected_set(next, EINA_TRUE);
- elm_gengrid_item_show(next);
+ elm_gengrid_item_show(next, ELM_GENGRID_ITEM_SCROLLTO_IN);
}
/*--------------------------FULL SCREEN CB-----------------------------*/
@@ -581,7 +581,7 @@ load_index_genlist(App *app,
Elm_Object_Item *parent;
parent = elm_genlist_item_append(app->gl_index, &glc2, it,
ancestor,
- ELM_GENLIST_ITEM_SUBITEMS,
+ ELM_GENLIST_ITEM_TREE,
_goto_page, app->grid);
load_index_genlist(app, parent, ch);
}
@@ -737,7 +737,7 @@ _change_selection(void *data,
}
elm_gengrid_item_selected_set(gg_it, EINA_TRUE);
- elm_gengrid_item_show(gg_it);
+ elm_gengrid_item_show(gg_it, ELM_GENGRID_ITEM_SCROLLTO_IN);
}
/*--------------------------FILE SELECTOR OK CB-----------------------*/
Index: BINDINGS/python/python-elementary/elementary/__init__.py
===================================================================
--- BINDINGS/python/python-elementary/elementary/__init__.py (리비전 69282)
+++ BINDINGS/python/python-elementary/elementary/__init__.py (작업 사본)
@@ -97,7 +97,7 @@ ELM_PANEL_ORIENT_LEFT = 2
ELM_PANEL_ORIENT_RIGHT = 3
ELM_GENLIST_ITEM_NONE = 0
-ELM_GENLIST_ITEM_SUBITEMS = 1
+ELM_GENLIST_ITEM_TREE = 1
ELM_GENLIST_ITEM_GROUP = 2
ELM_FLIP_ROTATE_Y_CENTER_AXIS = 0
Index: BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_panel.cpp
===================================================================
--- BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_panel.cpp (리비전
69282)
+++ BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_panel.cpp (작업 사본)
@@ -157,7 +157,7 @@ static void _fill_list (Evasxx::Object *obj)
NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
else
elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
- NULL, ELM_GENLIST_ITEM_SUBITEMS,
+ NULL, ELM_GENLIST_ITEM_TREE,
NULL, NULL);
free(real);
}
Index: BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_genlist.cpp
===================================================================
--- BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_genlist.cpp (리비전
69282)
+++ BINDINGS/cxx/eflxx_examples/src/elementaryxx/full/test_genlist.cpp (작업 사본)
@@ -1113,7 +1113,7 @@ static void gl4_exp (Evasxx::Object &obj, void *ev
(void *)(val + 2)/* item data */, glit/* parent */,
ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc4,
- (void *)(val + 3)/* item data */, glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
+ (void *)(val + 3)/* item data */, glit/* parent */,
ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
#endif
}
Index: BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h
===================================================================
--- BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h (리비전 69282)
+++ BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h (작업 사본)
@@ -177,8 +177,8 @@ class GenListColumnSelector;
* internal data (eg the struct with the original item data). The parent
* parameter is the parent genlist item this belongs to if it is a tree, and
* NULL if there is no parent. The flags can be a bitmask of
- * ELM_GENLIST_ITEM_NONE and ELM_GENLIST_ITEM_SUBITEMS. If
- * ELM_GENLIST_ITEM_SUBITEMS is set then this item is displayed as a item
+ * ELM_GENLIST_ITEM_NONE and ELM_GENLIST_ITEM_TREE. If
+ * ELM_GENLIST_ITEM_TREE is set then this item is displayed as a item
* that is able to expand and have child items. The func parameter is a
* convenience callback that is called when the item is selected and the data
* parameter will be the func_data parameter, obj be the genlist object and
@@ -371,9 +371,9 @@ class GenList : public Gen
#if 0
/* operations to add items */
- EAPI Elm_Object_Item *elm_genlist_item_prepend(Evas_Object *obj, const
Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent,
Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
- EAPI Elm_Object_Item *elm_genlist_item_insert_before(Evas_Object *obj,
const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent,
Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func,
const void *func_data);
- EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj, const
Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent,
Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func,
const void *func_data);
+ EAPI Elm_Object_Item *elm_genlist_item_prepend(Evas_Object *obj, const
Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent,
Elm_Genlist_Item_Type flags, Evas_Smart_Cb func, const void *func_data);
+ EAPI Elm_Object_Item *elm_genlist_item_insert_before(Evas_Object *obj,
const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent,
Elm_Genlist_Item *before, Elm_Genlist_Item_Type flags, Evas_Smart_Cb func,
const void *func_data);
+ EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj, const
Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent,
Elm_Genlist_Item *after, Elm_Genlist_Item_Type flags, Evas_Smart_Cb func, const
void *func_data);
/* operations to retrieve existing items */
Index: BINDINGS/perl/t/elementary_test.t
===================================================================
--- BINDINGS/perl/t/elementary_test.t (리비전 69282)
+++ BINDINGS/perl/t/elementary_test.t (작업 사본)
@@ -2497,7 +2497,7 @@ sub _move {
sub _bt50_cb {
my ($data) = @_;
- elm_genlist_item_bring_in($$data);
+ elm_genlist_item_bring_in($$data, ELM_GENLIST_ITEM_SCROLLTO_IN);
}
sub _bt1500_cb {
@@ -3416,7 +3416,7 @@ gl4_exp(void *data, Evas_Object *obj, void *event_
(void *)(val + 2)/* item data */, it/* parent */,
ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
undef/* func data */);
elm_genlist_item_append(gl, &itc4,
- (void *)(val + 3)/* item data */, it/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
+ (void *)(val + 3)/* item data */, it/* parent */,
ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
undef/* func data */);
}
static void
@@ -3505,10 +3505,10 @@ test_genlist6(void *data, Evas_Object *obj, void *
itc4.func.del = gl4_del;
elm_genlist_item_append(gl, &itc4,
- (void *)1/* item data */, undef/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
+ (void *)1/* item data */, undef/* parent */,
ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
undef/* func data */);
elm_genlist_item_append(gl, &itc4,
- (void *)2/* item data */, undef/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
+ (void *)2/* item data */, undef/* parent */,
ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
undef/* func data */);
elm_genlist_item_append(gl, &itc4,
(void *)3/* item data */, undef/* parent */,
ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
Index: BINDINGS/perl/Elementary/Makefile.PL
===================================================================
--- BINDINGS/perl/Elementary/Makefile.PL (리비전 69282)
+++ BINDINGS/perl/Elementary/Makefile.PL (작업 사본)
@@ -37,7 +37,7 @@ if (eval { require ExtUtils::Constant; 1 }) {
{'name' => 'ELM_FLIP_ROTATE_YZ_CENTER_AXIS', 'macro' => '1'},
{'name' => 'ELM_FLIP_ROTATE_Y_CENTER_AXIS', 'macro' => '1'},
{'name' => 'ELM_GENLIST_ITEM_NONE', 'macro' => '1'},
- {'name' => 'ELM_GENLIST_ITEM_SUBITEMS', 'macro' => '1'},
+ {'name' => 'ELM_GENLIST_ITEM_TREE', 'macro' => '1'},
{'name' => 'ELM_HOVER_AXIS_BOTH', 'macro' => '1'},
{'name' => 'ELM_HOVER_AXIS_HORIZONTAL', 'macro' => '1'},
{'name' => 'ELM_HOVER_AXIS_NONE', 'macro' => '1'},
Index: BINDINGS/perl/Elementary/Elementary.xs
===================================================================
--- BINDINGS/perl/Elementary/Elementary.xs (리비전 69282)
+++ BINDINGS/perl/Elementary/Elementary.xs (작업 사본)
@@ -1090,7 +1090,7 @@ elm_genlist_item_append(obj, itc, data, parent, fl
Elm_Genlist_Item_Class *itc
void *data
Elm_Genlist_Item *parent
- Elm_Genlist_Item_Flags flags
+ Elm_Genlist_Item_Type flags
SV *func
SV *func_data
PREINIT:
@@ -1110,13 +1110,13 @@ elm_genlist_item_append(obj, itc, data, parent, fl
=pod
TODO
Elm_Object_Item *
-elm_genlist_item_prepend(Evas_Object *obj, Elm_Genlist_Item_Class *itc, void
*data, Elm_Object_Item *parent, Elm_Genlist_Item_Flags flags, void (*func)
(void *data, Evas_Object *obj, void *event_info), void *func_data);
+elm_genlist_item_prepend(Evas_Object *obj, Elm_Genlist_Item_Class *itc, void
*data, Elm_Object_Item *parent, Elm_Genlist_Item_Type flags, void (*func) (void
*data, Evas_Object *obj, void *event_info), void *func_data);
Elm_Object_Item *
-elm_genlist_item_insert_before(Evas_Object *obj, Elm_Genlist_Item_Class *itc,
void *data, Elm_Object_Item *parent, Elm_Object_Item *before,
Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void
*event_info), void *func_data);
+elm_genlist_item_insert_before(Evas_Object *obj, Elm_Genlist_Item_Class *itc,
void *data, Elm_Object_Item *parent, Elm_Object_Item *before,
Elm_Genlist_Item_Type flags, void (*func) (void *data, Evas_Object *obj, void
*event_info), void *func_data);
Elm_Object_Item *
-elm_genlist_item_insert_after(Evas_Object *obj, Elm_Genlist_Item_Class *itc,
void *data, Elm_Object_Item *parent, Elm_Object_Item *after,
Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void
*event_info), void *func_data);
+elm_genlist_item_insert_after(Evas_Object *obj, Elm_Genlist_Item_Class *itc,
void *data, Elm_Object_Item *parent, Elm_Object_Item *after,
Elm_Genlist_Item_Type flags, void (*func) (void *data, Evas_Object *obj, void
*event_info), void *func_data);
=cut
Index: BINDINGS/perl/lib/EFL/Elementary.pm
===================================================================
--- BINDINGS/perl/lib/EFL/Elementary.pm (리비전 69282)
+++ BINDINGS/perl/lib/EFL/Elementary.pm (작업 사본)
@@ -39,7 +39,7 @@ our @__constants = qw(
ELM_FLIP_ROTATE_XZ_CENTER_AXIS
ELM_FLIP_ROTATE_YZ_CENTER_AXIS
ELM_GENLIST_ITEM_NONE
- ELM_GENLIST_ITEM_SUBITEMS
+ ELM_GENLIST_ITEM_TREE
ELM_HOVER_AXIS_BOTH
ELM_HOVER_AXIS_HORIZONTAL
ELM_HOVER_AXIS_NONE
@@ -828,7 +828,7 @@ may change in future releases.
ELM_FLIP_ROTATE_X_CENTER_AXIS
ELM_FLIP_ROTATE_Y_CENTER_AXIS
ELM_GENLIST_ITEM_NONE
- ELM_GENLIST_ITEM_SUBITEMS
+ ELM_GENLIST_ITEM_TREE
ELM_HOVER_AXIS_BOTH
ELM_HOVER_AXIS_HORIZONTAL
ELM_HOVER_AXIS_NONE
Index: ensure/src/errors.c
===================================================================
--- ensure/src/errors.c (리비전 69282)
+++ ensure/src/errors.c (작업 사본)
@@ -82,10 +82,10 @@ errors_update(struct ensure *ensure)
if (!enobj->enwin->genitem)
{
- enobj->enwin->genitem = elm_genlist_item_append(ensure->view,
&windowclass, enobj->enwin, NULL, ELM_GENLIST_ITEM_SUBITEMS, enwin_select,
enobj->enwin);
+ enobj->enwin->genitem = elm_genlist_item_append(ensure->view,
&windowclass, enobj->enwin, NULL, ELM_GENLIST_ITEM_TREE, enwin_select,
enobj->enwin);
}
- enobj->genitem = elm_genlist_item_append(ensure->view, &objc, enobj,
enobj->enwin->genitem, ELM_GENLIST_ITEM_SUBITEMS, enobj_select, enobj);
+ enobj->genitem = elm_genlist_item_append(ensure->view, &objc, enobj,
enobj->enwin->genitem, ELM_GENLIST_ITEM_TREE, enobj_select, enobj);
}
}
Index: ensure/src/entree.c
===================================================================
--- ensure/src/entree.c (리비전 69282)
+++ ensure/src/entree.c (작업 사본)
@@ -93,7 +93,7 @@ tree_update(struct ensure *ensure)
EINA_LIST_FOREACH (cur->windows, l, enwin)
{
assert(enwin->genitem == NULL);
- enwin->genitem = elm_genlist_item_append(ensure->view, &windowclass,
enwin, NULL, ELM_GENLIST_ITEM_GROUP | ELM_GENLIST_ITEM_SUBITEMS,
tree_window_select, enwin);
+ enwin->genitem = elm_genlist_item_append(ensure->view, &windowclass,
enwin, NULL, ELM_GENLIST_ITEM_GROUP | ELM_GENLIST_ITEM_TREE,
tree_window_select, enwin);
}
eina_hash_foreach(cur->objdb, tree_add_toplevel, ensure);
@@ -125,7 +125,7 @@ tree_add_toplevel(const Eina_Hash *hash __UNUSED__
{
struct enobj *enobj;
struct ensure *ensure = ensurev;
- Elm_Genlist_Item_Flags flags;
+ Elm_Genlist_Item_Type flags;
enobj = enobjv;
if (enobj->parent)
@@ -133,7 +133,7 @@ tree_add_toplevel(const Eina_Hash *hash __UNUSED__
assert(enobj->genitem == NULL);
assert(enobj->magic == (int)ENOBJMAGIC);
- flags = ELM_GENLIST_ITEM_SUBITEMS;
+ flags = ELM_GENLIST_ITEM_TREE;
// printf("Obj: %p Children: %p Clips: %p\n",enobj, enobj->children,
// enobj->clippees);
Index: ensure/src/enconfig.c
===================================================================
--- ensure/src/enconfig.c (리비전 69282)
+++ ensure/src/enconfig.c (작업 사본)
@@ -94,7 +94,7 @@ config_add_classes(Evas_Object *gl)
for (i = 0; i < ENSURE_N_SEVERITIES; i++)
{
severity[i].item = elm_genlist_item_append(gl, &clc, severity + i,
NULL, /* No parent */
- ELM_GENLIST_ITEM_SUBITEMS,
cfg_sel, severity + i /* data */);
+ ELM_GENLIST_ITEM_TREE,
cfg_sel, severity + i /* data */);
}
}
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
