summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2011-10-30 16:10:16 +0000
committerChunEon Park <hermet@hermet.pe.kr>2011-10-30 16:10:16 +0000
commit771202d8f8a615b176398082b485ec1ad4ab3d79 (patch)
tree1036cfb275d771d6b062762b6a24b5c39900be39
parent1e3d557d2521c30f44de1c9ac70101dca7c6d79d (diff)
elementray/naviframe - added more macros.
these macros are more clear than part names in using content/text_part_set/get/unset functions. SVN revision: 64525
-rw-r--r--legacy/elementary/src/bin/test_naviframe.c9
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in8
2 files changed, 11 insertions, 6 deletions
diff --git a/legacy/elementary/src/bin/test_naviframe.c b/legacy/elementary/src/bin/test_naviframe.c
index df4973dfdd..c2d8c8ccbb 100644
--- a/legacy/elementary/src/bin/test_naviframe.c
+++ b/legacy/elementary/src/bin/test_naviframe.c
@@ -54,8 +54,8 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
54 bt, 54 bt,
55 bt2, 55 bt2,
56 NULL); 56 NULL);
57 elm_object_item_text_part_set(it, "elm.text.subtitle", "Here is sub-title part!"); 57 elm_object_item_text_part_set(it, ELM_NAVIFRAME_ITEM_TEXT_SUBTITLE, "Here is sub-title part!");
58 elm_object_item_content_part_set(it, "elm.swallow.icon", ic); 58 elm_object_item_content_part_set(it, ELM_NAVIFRAME_ITEM_CONTENT_ICON, ic);
59 elm_naviframe_item_title_visible_set(it, EINA_FALSE); 59 elm_naviframe_item_title_visible_set(it, EINA_FALSE);
60 evas_object_smart_callback_add(bt2, "clicked", _title_visible, it); 60 evas_object_smart_callback_add(bt2, "clicked", _title_visible, it);
61} 61}
@@ -93,7 +93,7 @@ _page3(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
93 bt3, 93 bt3,
94 NULL); 94 NULL);
95 elm_object_item_text_part_set(it, "elm.text.subtitle", "Here is sub-title part!"); 95 elm_object_item_text_part_set(it, "elm.text.subtitle", "Here is sub-title part!");
96 elm_object_item_content_part_set(it, "elm.swallow.icon", ic); 96 elm_object_item_content_part_set(it, ELM_NAVIFRAME_ITEM_CONTENT_ICON, ic);
97} 97}
98 98
99void 99void
@@ -123,7 +123,7 @@ _page2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
123 bt, 123 bt,
124 bt2, 124 bt2,
125 NULL); 125 NULL);
126 elm_object_item_text_part_set(it, "elm.text.subtitle", "Here is sub-title part!"); 126 elm_object_item_text_part_set(it, ELM_NAVIFRAME_ITEM_TEXT_SUBTITLE, "Here is sub-title part!");
127} 127}
128 128
129void 129void
@@ -143,6 +143,7 @@ test_naviframe(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
143 143
144 nf = elm_naviframe_add(win); 144 nf = elm_naviframe_add(win);
145 elm_win_resize_object_add(win, nf); 145 elm_win_resize_object_add(win, nf);
146 evas_object_size_hint_weight_set(nf, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
146 evas_object_show(nf); 147 evas_object_show(nf);
147 evas_object_smart_callback_add(nf, "title,clicked", _title_clicked, 0); 148 evas_object_smart_callback_add(nf, "title,clicked", _title_clicked, 0);
148 149
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index da33280e5a..9c2f5a0373 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -28192,17 +28192,21 @@ extern "C" {
28192 * 28192 *
28193 * Default contents parts of the naviframe items that you can use for are: 28193 * Default contents parts of the naviframe items that you can use for are:
28194 * @li "elm.swallow.content" - A main content of the page 28194 * @li "elm.swallow.content" - A main content of the page
28195 * @li "elm.swallow.icon" - A icon in the title area
28195 * @li "elm.swallow.prev_btn" - A button to go to the previous page 28196 * @li "elm.swallow.prev_btn" - A button to go to the previous page
28196 * @li "elm.swallow.next_btn" - A button to go to the next page 28197 * @li "elm.swallow.next_btn" - A button to go to the next page
28197 * 28198 *
28198 * Default text parts of the naviframe items that you can use for are: 28199 * Default text parts of the naviframe items that you can use for are:
28199 * @li "elm.text.title" - Title label in the title area 28200 * @li "elm.text.title" - Title label in the title area
28201 * @li "elm.text.subtitle" - Sub-title label in the title area
28200 * 28202 *
28201 * @ref tutorial_naviframe gives a good overview of the usage of the API. 28203 * @ref tutorial_naviframe gives a good overview of the usage of the API.
28202 */ 28204 */
28203 28205
28204#define ELM_NAVIFRAME_ITEM_PREV_BTN "elm.swallow.prev_btn" 28206#define ELM_NAVIFRAME_ITEM_CONTENT_ICON "elm.swallow.icon"
28205#define ELM_NAVIFRAME_ITEM_NEXT_BTN "elm.swallow.next_btn" 28207#define ELM_NAVIFRAME_ITEM_CONTENT_PREV_BTN "elm.swallow.prev_btn"
28208#define ELM_NAVIFRAME_ITEM_CONTNET_NEXT_BTN "elm.swallow.next_btn"
28209#define ELM_NAVIFRAME_ITEM_TEXT_SUBTITLE "elm.text.subtitle"
28206 28210
28207 /** 28211 /**
28208 * @addtogroup Naviframe 28212 * @addtogroup Naviframe