diff options
Diffstat (limited to 'meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch')
-rw-r--r-- | meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch | 296 |
1 files changed, 296 insertions, 0 deletions
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch b/meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch new file mode 100644 index 000000000..4cd0389cb --- /dev/null +++ b/meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch | |||
@@ -0,0 +1,296 @@ | |||
1 | From d1494e2e59d99cd2b7948a870dca00ae789431b9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 14 Feb 2012 20:52:05 +0100 | ||
4 | Subject: [PATCH 6/8] remove deprecated API | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | src/gui.c | 64 ++++++++++++++++++++++++++++++------------------------------ | ||
9 | 1 files changed, 32 insertions(+), 32 deletions(-) | ||
10 | |||
11 | diff --git a/src/gui.c b/src/gui.c | ||
12 | index 0291378..c798f75 100644 | ||
13 | --- a/src/gui.c | ||
14 | +++ b/src/gui.c | ||
15 | @@ -75,7 +75,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info) | ||
16 | if (last_rec != -1) { //cater for initial null data | ||
17 | sprintf(te_data, "%s", (const char *)elm_entry_entry_get(tk)); | ||
18 | task_entry = strtok(te_data, "<"); | ||
19 | - tsk = (_Task *)elm_genlist_item_data_get(task_list[last_rec]); | ||
20 | + tsk = (_Task *)elm_object_item_data_get(task_list[last_rec]); | ||
21 | if (strcmp(task_entry, tsk->text) != 0) { | ||
22 | sprintf(tsk->text, "%s", task_entry); | ||
23 | WRITE = 1; | ||
24 | @@ -90,7 +90,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info) | ||
25 | |||
26 | Evas_Object *li = data; | ||
27 | item = (Elm_Object_Item *)elm_genlist_selected_item_get(li); | ||
28 | - tsk = (_Task *)elm_genlist_item_data_get(item); | ||
29 | + tsk = (_Task *)elm_object_item_data_get(item); | ||
30 | last_rec = tsk->no; | ||
31 | elm_object_text_set(cat_bt, tsk->cat); | ||
32 | sprintf(tystr, "%d", tsk->pr); | ||
33 | @@ -117,7 +117,7 @@ void set_priority(void *data, Evas_Object *obj, void *event_info) | ||
34 | dummy_pr = atoi(prio); | ||
35 | return; | ||
36 | } | ||
37 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
38 | + _Task *tsk = (_Task *)elm_object_item_data_get(item); | ||
39 | if(tsk->pr == ty) return; | ||
40 | tsk->pr = ty; | ||
41 | WRITE = 1; | ||
42 | @@ -131,13 +131,13 @@ void set_category(void *data, Evas_Object *obj, void *event_info) | ||
43 | item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
44 | evas_object_hide(hs); | ||
45 | if (!item) return; | ||
46 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
47 | + _Task *tsk = (_Task *)elm_object_item_data_get(item); | ||
48 | if (strcmp(tsk->cat, category) == 0) return; | ||
49 | strcpy(tsk->cat, category); | ||
50 | elm_object_text_set(cat_bt, category); | ||
51 | WRITE = 1; | ||
52 | if (strcmp(sel_category, " All Tasks ") !=0 && | ||
53 | - strcmp(sel_category, category) != 0) elm_genlist_item_del(item); | ||
54 | + strcmp(sel_category, category) != 0) elm_object_item_del(item); | ||
55 | } | ||
56 | |||
57 | void set_date(void *data, Evas_Object *obj, void *event_info) | ||
58 | @@ -151,7 +151,7 @@ void set_date(void *data, Evas_Object *obj, void *event_info) | ||
59 | strcpy(dummy_date, dt); | ||
60 | return; | ||
61 | } | ||
62 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
63 | + _Task *tsk = (_Task *)elm_object_item_data_get(item); | ||
64 | if (strcmp(tsk->date, dt) == 0) return; | ||
65 | strcpy(tsk->date, dt); | ||
66 | WRITE = 1; | ||
67 | @@ -167,7 +167,7 @@ void task_cb_changed(void *data, Evas_Object *obj, void *event_info) | ||
68 | //printf("no %d key %d\n", tsk->no, tsk->key); | ||
69 | //TODO - strike through the task | ||
70 | //remove this task from the list | ||
71 | - elm_genlist_item_del(task_list[tsk->no]); | ||
72 | + elm_object_item_del(task_list[tsk->no]); | ||
73 | //update the db | ||
74 | update_record (tsk->no); | ||
75 | last_rec = -1; | ||
76 | @@ -218,7 +218,7 @@ void set_create_date(void *data, Evas_Object *obj, void *event_info) | ||
77 | Details *det = data; | ||
78 | evas_object_hide(det->hover); | ||
79 | //change date value of selected task | ||
80 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item); | ||
81 | + _Task *tsk = (_Task *)elm_object_item_data_get(det->item); | ||
82 | strcpy(tsk->date, det->data); | ||
83 | //update button label | ||
84 | elm_object_text_set(det->button, det->data); | ||
85 | @@ -230,7 +230,7 @@ void set_create_priority(void *data, Evas_Object *obj, void *event_info) | ||
86 | Details *det = data; | ||
87 | evas_object_hide(det->hover); | ||
88 | //change priority value of selected task | ||
89 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item); | ||
90 | + _Task *tsk = (_Task *)elm_object_item_data_get(det->item); | ||
91 | tsk->pr = atoi(det->data); | ||
92 | //update button label | ||
93 | elm_object_text_set(det->button, det->data); | ||
94 | @@ -295,7 +295,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
95 | //check task selected - otherwise return | ||
96 | Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
97 | if(!item) return; | ||
98 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
99 | + _Task *tsk = (_Task *)elm_object_item_data_get(item); | ||
100 | det_page = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); | ||
101 | elm_win_title_set(det_page, "Task Details"); | ||
102 | elm_win_autodel_set(det_page, 1); | ||
103 | @@ -322,7 +322,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
104 | lb = elm_label_add(det_page); | ||
105 | elm_object_text_set(lb,"Edit Task Details"); | ||
106 | evas_object_size_hint_align_set(lb, 0.5, -1.0); | ||
107 | - elm_frame_content_set(fr, lb); | ||
108 | + elm_object_content_set(fr, lb); | ||
109 | evas_object_show(lb); | ||
110 | |||
111 | //add a label | ||
112 | @@ -366,7 +366,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
113 | |||
114 | bt = elm_button_add(det_page); | ||
115 | elm_object_text_set(bt, "Pr"); | ||
116 | - elm_hover_content_set(det_hv, "middle", bt); | ||
117 | + elm_object_part_content_set(det_hv, "middle", bt); | ||
118 | evas_object_show(bt); | ||
119 | |||
120 | bx = elm_box_add(det_page); | ||
121 | @@ -384,7 +384,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
122 | evas_object_show(bt); | ||
123 | } | ||
124 | evas_object_show(bx); | ||
125 | - elm_hover_content_set(det_hv, "bottom", bx); | ||
126 | + elm_object_part_content_set(det_hv, "bottom", bx); | ||
127 | |||
128 | //add a label to hbox | ||
129 | lb = elm_label_add(det_page); | ||
130 | @@ -409,14 +409,14 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
131 | |||
132 | bt = elm_button_add(det_page); | ||
133 | elm_object_text_set(bt, "Category"); | ||
134 | - elm_hover_content_set(hs, "middle", bt); | ||
135 | + elm_object_part_content_set(hs, "middle", bt); | ||
136 | evas_object_show(bt); | ||
137 | |||
138 | bx = elm_box_add(det_page); | ||
139 | //add categories | ||
140 | add_hs_items (det_page, bx, bt, 0); | ||
141 | evas_object_show(bx); | ||
142 | - elm_hover_content_set(hs, "bottom", bx); | ||
143 | + elm_object_part_content_set(hs, "bottom", bx); | ||
144 | |||
145 | //add a label to hbox | ||
146 | lb = elm_label_add(det_page); | ||
147 | @@ -442,7 +442,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
148 | |||
149 | bt = elm_button_add(det_page); | ||
150 | elm_object_text_set(bt, "Date"); | ||
151 | - elm_hover_content_set(c_date_hs, "middle", bt); | ||
152 | + elm_object_part_content_set(c_date_hs, "middle", bt); | ||
153 | evas_object_show(bt); | ||
154 | |||
155 | bx = elm_box_add(det_page); | ||
156 | @@ -486,7 +486,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
157 | evas_object_show(bt); | ||
158 | |||
159 | evas_object_show(bx); | ||
160 | - elm_hover_content_set(c_date_hs, "bottom", bx); | ||
161 | + elm_object_part_content_set(c_date_hs, "bottom", bx); | ||
162 | |||
163 | //add a label | ||
164 | lb = elm_label_add(det_page); | ||
165 | @@ -568,7 +568,7 @@ void save_button_clicked(void *data, Evas_Object *obj, void *event_info) | ||
166 | //get task no | ||
167 | Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
168 | if (item) { | ||
169 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
170 | + _Task *tsk = (_Task *)elm_object_item_data_get(item); | ||
171 | |||
172 | //get data from entry | ||
173 | sprintf(te_data, "%s", (const char *)elm_entry_entry_get(tk)); | ||
174 | @@ -627,7 +627,7 @@ void note_done(void *data, Evas_Object *obj, void *event_info) | ||
175 | //Evas_Object *en = data; | ||
176 | |||
177 | Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
178 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
179 | + _Task *tsk = (_Task *)elm_object_item_data_get(item); | ||
180 | sprintf(tystr, "%s", elm_entry_entry_get(data)); | ||
181 | if (strcmp(tystr, "<br>") == 0) strcpy(tystr, ""); | ||
182 | strcpy(tsk->note, tystr); | ||
183 | @@ -643,7 +643,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info) | ||
184 | |||
185 | Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
186 | if(!item) return; | ||
187 | - _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
188 | + _Task *tsk = (_Task *)elm_object_item_data_get(item); | ||
189 | |||
190 | note_win = elm_win_add(NULL, "note", ELM_WIN_BASIC); | ||
191 | elm_win_title_set(note_win, "Note"); | ||
192 | @@ -721,7 +721,7 @@ void create_cat_hover(void) | ||
193 | cat_hv_bx = elm_box_add(win); | ||
194 | add_hs_items (win, cat_hv_bx, bt, 1); | ||
195 | evas_object_show(cat_hv_bx); | ||
196 | - elm_hover_content_set(hs1, "top", cat_hv_bx); | ||
197 | + elm_object_part_content_set(hs1, "top", cat_hv_bx); | ||
198 | evas_object_hide(hs1); | ||
199 | } | ||
200 | |||
201 | @@ -880,7 +880,7 @@ void create_gui(Evas_Object *win) | ||
202 | |||
203 | bt = elm_button_add(win); | ||
204 | elm_object_text_set(bt, "Pr"); | ||
205 | - elm_hover_content_set(hv, "middle", bt); | ||
206 | + elm_object_part_content_set(hv, "middle", bt); | ||
207 | evas_object_show(bt); | ||
208 | |||
209 | bx = elm_box_add(win); | ||
210 | @@ -895,7 +895,7 @@ void create_gui(Evas_Object *win) | ||
211 | evas_object_show(bt); | ||
212 | } | ||
213 | evas_object_show(bx); | ||
214 | - elm_hover_content_set(hv, "bottom", bx); | ||
215 | + elm_object_part_content_set(hv, "bottom", bx); | ||
216 | |||
217 | //add scroller for entry | ||
218 | sc = elm_scroller_add(win); | ||
219 | @@ -911,7 +911,7 @@ void create_gui(Evas_Object *win) | ||
220 | elm_entry_entry_set(tk, "Task"); | ||
221 | evas_object_size_hint_weight_set(tk, 1.0, 0.0); | ||
222 | evas_object_size_hint_align_set(tk, -1.0, 0.0); | ||
223 | - elm_scroller_content_set(sc, tk); | ||
224 | + elm_object_content_set(sc, tk); | ||
225 | evas_object_show(tk); | ||
226 | evas_object_show(sc); | ||
227 | |||
228 | @@ -934,13 +934,13 @@ void create_gui(Evas_Object *win) | ||
229 | |||
230 | bt = elm_button_add(win); | ||
231 | elm_object_text_set(bt, "Date"); | ||
232 | - elm_hover_content_set(date_hs, "middle", bt); | ||
233 | + elm_object_part_content_set(date_hs, "middle", bt); | ||
234 | evas_object_show(bt); | ||
235 | |||
236 | bx1 = elm_box_add(win); | ||
237 | add_dates(win, bx1, bt); | ||
238 | evas_object_show(bx1); | ||
239 | - elm_hover_content_set(date_hs, "bottom", bx1); | ||
240 | + elm_object_part_content_set(date_hs, "bottom", bx1); | ||
241 | |||
242 | //add save button | ||
243 | save_button = elm_button_add(win); | ||
244 | @@ -957,7 +957,7 @@ void create_gui(Evas_Object *win) | ||
245 | evas_object_size_hint_align_set(list, -1.0, -1.0); | ||
246 | elm_list_multi_select_set(list, 0); | ||
247 | elm_box_pack_end(vbox, list); | ||
248 | - elm_genlist_horizontal_mode_set(list, ELM_LIST_LIMIT); | ||
249 | + elm_genlist_mode_set(list, ELM_LIST_LIMIT); | ||
250 | evas_object_show(list); | ||
251 | evas_object_smart_callback_add(list, "selected", task_select, list); | ||
252 | |||
253 | @@ -1027,7 +1027,7 @@ void create_gui(Evas_Object *win) | ||
254 | |||
255 | bt = elm_button_add(win); | ||
256 | elm_object_text_set(bt, " All Tasks "); | ||
257 | - elm_hover_content_set(hs1, "middle", bt); | ||
258 | + elm_object_part_content_set(hs1, "middle", bt); | ||
259 | evas_object_show(bt); | ||
260 | create_cat_hover (); | ||
261 | |||
262 | @@ -1118,7 +1118,7 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info) | ||
263 | vbox = elm_box_add(cat_dialog); | ||
264 | elm_win_resize_object_add(cat_dialog, vbox); | ||
265 | evas_object_size_hint_weight_set(vbox, 1.0, 1.0); | ||
266 | - elm_win_inwin_content_set(inwin, vbox); | ||
267 | + elm_object_content_set(inwin, vbox); | ||
268 | evas_object_show(vbox); | ||
269 | |||
270 | //add hbox to vbox | ||
271 | @@ -1194,11 +1194,11 @@ void del_cat_button_clicked(void *data, Evas_Object *obj, void *event_info) | ||
272 | { | ||
273 | Evas_Object *li = data; | ||
274 | Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(li); | ||
275 | - char *_cat = (char *)elm_genlist_item_data_get(item); | ||
276 | + char *_cat = (char *)elm_object_item_data_get(item); | ||
277 | //delete category from db | ||
278 | del_category(_cat); | ||
279 | //remove item from list | ||
280 | - elm_genlist_item_del(item); | ||
281 | + elm_object_item_del(item); | ||
282 | create_cat_hover (); | ||
283 | if(strcmp(sel_category, _cat) == 0) select_category (" All Tasks ", NULL, NULL); | ||
284 | } | ||
285 | @@ -1263,7 +1263,7 @@ void edit_cat(void) | ||
286 | // add a label | ||
287 | lb = elm_label_add(cat_win); | ||
288 | elm_object_text_set(lb, "Task Categories"); | ||
289 | - elm_frame_content_set(fr, lb); | ||
290 | + elm_object_content_set(fr, lb); | ||
291 | evas_object_show(lb); | ||
292 | |||
293 | //add list to vbox now | ||
294 | -- | ||
295 | 1.7.8.4 | ||
296 | |||