summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--exyz.c39
1 files changed, 20 insertions, 19 deletions
diff --git a/exyz.c b/exyz.c
index 5bd61eb..790702d 100644
--- a/exyz.c
+++ b/exyz.c
@@ -265,7 +265,7 @@ _promote(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
265} 265}
266 266
267void 267void
268_page3(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 268_page_projects(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
269{ 269{
270 Evas_Object *bt, *content, *nf = data; 270 Evas_Object *bt, *content, *nf = data;
271 Elm_Object_Item *it; 271 Elm_Object_Item *it;
@@ -278,35 +278,31 @@ _page3(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
278 content = _content_new(nf); 278 content = _content_new(nf);
279 it = elm_naviframe_item_push(nf, "Projects", bt, NULL, content, NULL); 279 it = elm_naviframe_item_push(nf, "Projects", bt, NULL, content, NULL);
280 elm_object_item_part_text_set(it, "subtitle", "List with actions items for all projects"); 280 elm_object_item_part_text_set(it, "subtitle", "List with actions items for all projects");
281 evas_object_data_set(nf, "projects", it);
281} 282}
282 283
283void 284void
284_page2(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 285_page_journal(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
285{ 286{
286 Evas_Object *bt, *content, *bt2, *nf = data; 287 Evas_Object *bt, *content, *nf = data;
287 Elm_Object_Item *it; 288 Elm_Object_Item *it;
288 289
289 bt = elm_button_add(nf); 290 bt = elm_button_add(nf);
290 evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); 291 evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
291 evas_object_smart_callback_add(bt, "clicked", _promote, 292 evas_object_smart_callback_add(bt, "clicked", _promote,
292 evas_object_data_get(nf, "page1")); 293 evas_object_data_get(nf, "actions"));
293 elm_object_text_set(bt, "Journal"); 294 elm_object_text_set(bt, "Next Actions");
294
295 bt2 = elm_button_add(nf);
296 evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL, EVAS_HINT_FILL);
297 evas_object_smart_callback_add(bt2, "clicked", _page3, nf);
298 elm_object_text_set(bt2, "Projects");
299 295
300 content = _content_new(nf); 296 content = _content_new(nf);
301 it = elm_naviframe_item_push(nf, "Next Actions", bt, bt2, content, NULL); 297 it = elm_naviframe_item_push(nf, "Journal", bt, bt, content, NULL);
302 elm_object_item_part_text_set(it, "subtitle", "Upcoming items"); 298 elm_object_item_part_text_set(it, "subtitle", "Chronological list with finished items");
303 evas_object_data_set(nf, "page2", it); 299 evas_object_data_set(nf, "journal", it);
304} 300}
305 301
306EAPI_MAIN int 302EAPI_MAIN int
307elm_main(int argc, char **argv) 303elm_main(int argc, char **argv)
308{ 304{
309 Evas_Object *win, *nf, *btn, *content; 305 Evas_Object *win, *nf, *btn, *btn2, *content;
310 Elm_Object_Item *it; 306 Elm_Object_Item *it;
311 307
312 win = elm_win_util_standard_add("naviframe", "Naviframe"); 308 win = elm_win_util_standard_add("naviframe", "Naviframe");
@@ -321,14 +317,19 @@ elm_main(int argc, char **argv)
321 317
322 btn = elm_button_add(nf); 318 btn = elm_button_add(nf);
323 evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); 319 evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
324 evas_object_smart_callback_add(btn, "clicked", _page2, nf); 320 evas_object_smart_callback_add(btn, "clicked", _page_journal, nf);
325 elm_object_text_set(btn, "Next Actions"); 321 elm_object_text_set(btn, "Journal");
326 evas_object_show(btn); 322 evas_object_show(btn);
327 323
324 btn2 = elm_button_add(nf);
325 evas_object_size_hint_align_set(btn2, EVAS_HINT_FILL, EVAS_HINT_FILL);
326 evas_object_smart_callback_add(btn2, "clicked", _page_projects, nf);
327 elm_object_text_set(btn2, "Projects");
328
328 content = _content_new(nf); 329 content = _content_new(nf);
329 it = elm_naviframe_item_push(nf, "Journal", NULL, btn, content, NULL); 330 it = elm_naviframe_item_push(nf, "Next Actions", btn, btn2, content, NULL);
330 evas_object_data_set(nf, "page1", it); 331 evas_object_data_set(nf, "actions", it);
331 elm_object_item_part_text_set(it, "subtitle", "Chronological list with finished items"); 332 elm_object_item_part_text_set(it, "subtitle", "Upcoming items");
332 333
333 evas_object_resize(win, 480, 700); 334 evas_object_resize(win, 480, 700);
334 evas_object_show(win); 335 evas_object_show(win);