summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-03-16 17:30:00 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-03-16 17:30:00 +0000
commit1a636cd8b74293639057ddba5bf6971564a2c94a (patch)
tree5d53f8e7b0d4cf93998fe3768a204bc014ae9650
parentaad0342c7227b469693cc05c2c3147d68f94d029 (diff)
E-MODULES-EXTRA/elfe - elm_pager -> elm_naviframe
SVN revision: 69473
-rw-r--r--src/allapps.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/allapps.c b/src/allapps.c
index ce64f9f..8c6de10 100644
--- a/src/allapps.c
+++ b/src/allapps.c
@@ -16,7 +16,7 @@ struct _Elfe_Allapps
16 Evas_Object *widgets_list; 16 Evas_Object *widgets_list;
17 Evas_Object *config_list; 17 Evas_Object *config_list;
18 Evas_Object *selector; 18 Evas_Object *selector;
19 Evas_Object *pager; 19 Evas_Object *nf;
20 Eina_List *buttons; 20 Eina_List *buttons;
21 Eina_List *grid_items; 21 Eina_List *grid_items;
22}; 22};
@@ -200,7 +200,7 @@ _apps_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __UN
200 bt = eina_list_nth(allapps->buttons, 2); 200 bt = eina_list_nth(allapps->buttons, 2);
201 elm_object_disabled_set(bt, EINA_FALSE); 201 elm_object_disabled_set(bt, EINA_FALSE);
202 202
203 elm_pager_content_promote(allapps->pager, allapps->grid); 203 elm_naviframe_item_simple_promote(allapps->nf, allapps->grid);
204 204
205} 205}
206 206
@@ -220,7 +220,7 @@ _widgets_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info _
220 bt = eina_list_nth(allapps->buttons, 2); 220 bt = eina_list_nth(allapps->buttons, 2);
221 elm_object_disabled_set(bt, EINA_FALSE); 221 elm_object_disabled_set(bt, EINA_FALSE);
222 222
223 elm_pager_content_promote(allapps->pager, allapps->widgets_list); 223 elm_naviframe_item_simple_promote(allapps->nf, allapps->widgets_list);
224} 224}
225 225
226 226
@@ -239,7 +239,7 @@ _config_clicked_cb(void *data , Evas_Object *obj __UNUSED__, void *event_info __
239 bt = eina_list_nth(allapps->buttons, 2); 239 bt = eina_list_nth(allapps->buttons, 2);
240 elm_object_disabled_set(bt, EINA_TRUE); 240 elm_object_disabled_set(bt, EINA_TRUE);
241 241
242 elm_pager_content_promote(allapps->pager, allapps->config_list); 242 elm_naviframe_item_simple_promote(allapps->nf, allapps->config_list);
243 243
244} 244}
245 245
@@ -306,10 +306,10 @@ elfe_allapps_add(Evas_Object *parent)
306 evas_object_show(allapps->selector); 306 evas_object_show(allapps->selector);
307 elm_box_pack_end(allapps->box, allapps->selector); 307 elm_box_pack_end(allapps->box, allapps->selector);
308 308
309 allapps->pager = elm_pager_add(allapps->box); 309 allapps->nf = elm_naviframe_add(allapps->box);
310 evas_object_show(allapps->pager); 310 evas_object_show(allapps->nf);
311 elm_box_pack_end(allapps->box, allapps->pager); 311 elm_box_pack_end(allapps->box, allapps->nf);
312 elm_object_style_set(allapps->pager, "slide_invisible"); 312 elm_object_style_set(allapps->nf, "slide_invisible");
313 313
314 allapps->grid = elm_gengrid_add(parent); 314 allapps->grid = elm_gengrid_add(parent);
315 elm_gengrid_item_size_set(allapps->grid, 0, 0); 315 elm_gengrid_item_size_set(allapps->grid, 0, 0);
@@ -339,17 +339,17 @@ elfe_allapps_add(Evas_Object *parent)
339 evas_object_show(allapps->grid); 339 evas_object_show(allapps->grid);
340 340
341 341
342 allapps->widgets_list = elfe_gadget_list_add(allapps->pager); 342 allapps->widgets_list = elfe_gadget_list_add(allapps->nf);
343 evas_object_smart_callback_add(allapps->widgets_list, "list,longpressed", _widget_longpress, allapps); 343 evas_object_smart_callback_add(allapps->widgets_list, "list,longpressed", _widget_longpress, allapps);
344 evas_object_show(allapps->widgets_list); 344 evas_object_show(allapps->widgets_list);
345 345
346 evas_object_show(allapps->box); 346 evas_object_show(allapps->box);
347 347
348 evas_object_size_hint_weight_set(allapps->pager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 348 evas_object_size_hint_weight_set(allapps->nf, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
349 evas_object_size_hint_align_set(allapps->pager, EVAS_HINT_FILL, EVAS_HINT_FILL); 349 evas_object_size_hint_align_set(allapps->nf, EVAS_HINT_FILL, EVAS_HINT_FILL);
350 350
351 elm_pager_content_push(allapps->pager, allapps->widgets_list); 351 elm_naviframe_item_simple_push(allapps->nf, allapps->widgets_list);
352 elm_pager_content_push(allapps->pager, allapps->grid); 352 elm_naviframe_item_simple_push(allapps->nf, allapps->grid);
353 353
354 return allapps->box; 354 return allapps->box;
355} 355}