summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl/e17
diff options
context:
space:
mode:
Diffstat (limited to 'meta-efl/recipes-efl/e17')
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0001-adapt-to-newer-elm-API.patch656
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks_svn.bb3
2 files changed, 658 insertions, 1 deletions
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0001-adapt-to-newer-elm-API.patch b/meta-efl/recipes-efl/e17/e-tasks/0001-adapt-to-newer-elm-API.patch
new file mode 100644
index 000000000..70fa1695f
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-tasks/0001-adapt-to-newer-elm-API.patch
@@ -0,0 +1,656 @@
1From 1204c115e006b380c2c64452c9d35f0d695502fe Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 6 Dec 2011 19:07:56 +0100
4Subject: [PATCH] adapt to newer elm API
5
6* sed 's/elm_button_label_set/elm_object_text_set/g' -i src/gui.c
7 sed 's/elm_button_label_set/elm_object_text_set/g' -i src/db_sqlite.c
8 sed 's/elm_label_label_set/elm_object_text_set/g' -i src/gui.c
9 sed 's/elm_button_icon_set/elm_object_content_set/g' -i src/gui.c
10 sed 's/elm_box_homogenous_set/elm_box_homogeneous_set/g' -i src/gui.c
11 sed 's/label_get/text_get/g' -i src/gui.c
12 sed 's/icon_get/content_get/g' -i src/gui.c
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 src/db_sqlite.c | 12 ++--
17 src/gui.c | 138 +++++++++++++++++++++++++++---------------------------
18 2 files changed, 75 insertions(+), 75 deletions(-)
19
20diff --git a/src/db_sqlite.c b/src/db_sqlite.c
21index dfee471..fde2181 100644
22--- a/src/db_sqlite.c
23+++ b/src/db_sqlite.c
24@@ -118,7 +118,7 @@ void restore_state(void)
25 if (db_ret == SQLITE_ROW) sprintf(sel_category, "%s", sqlite3_column_text(stmt, 0));
26 sqlite3_finalize(stmt);
27 if(strcmp(sel_category, "")== 0) strcpy(sel_category, " All Tasks ");
28- elm_button_label_set(sel_cat_bt, sel_category);
29+ elm_object_text_set(sel_cat_bt, sel_category);
30 load_data ();
31 }
32
33@@ -232,7 +232,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
34 if (i) {
35 sprintf(cate, " All Tasks ");
36 bt = elm_button_add(win);
37- elm_button_label_set(bt,cate);
38+ elm_object_text_set(bt,cate);
39 elm_box_pack_end(bx, bt);
40 tystr = strdup(cate);
41 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
42@@ -240,7 +240,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
43
44 sprintf(cate, "Deleted");
45 bt = elm_button_add(win);
46- elm_button_label_set(bt,cate);
47+ elm_object_text_set(bt,cate);
48 elm_box_pack_end(bx, bt);
49 tystr = strdup(cate);
50 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
51@@ -248,7 +248,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
52
53 sprintf(cate, "Edit Categories");
54 bt = elm_button_add(win);
55- elm_button_label_set(bt,cate);
56+ elm_object_text_set(bt,cate);
57 elm_box_pack_end(bx, bt);
58 tystr = strdup(cate);
59 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
60@@ -264,7 +264,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
61 sprintf(cate, "%s", sqlite3_column_text(stmt, 0));
62 if (i) {
63 bt = elm_button_add(win);
64- elm_button_label_set(bt,cate);
65+ elm_object_text_set(bt,cate);
66 elm_box_pack_end(bx, bt);
67 tystr = strdup(cate);
68 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
69@@ -272,7 +272,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
70 }
71 else {
72 bt = elm_button_add(win);
73- elm_button_label_set(bt, cate);
74+ elm_object_text_set(bt, cate);
75 elm_box_pack_end(bx, bt);
76 tystr = strdup(cate);
77 evas_object_smart_callback_add(bt, "clicked", set_category, (char *)tystr);
78diff --git a/src/gui.c b/src/gui.c
79index 113c807..5c8003c 100644
80--- a/src/gui.c
81+++ b/src/gui.c
82@@ -51,11 +51,11 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
83 return;
84 }
85 if(strcmp(cat, "Deleted") ==0) {
86- elm_button_label_set(new_button, "Purge");
87+ elm_object_text_set(new_button, "Purge");
88 }
89- else elm_button_label_set(new_button, "Add");
90+ else elm_object_text_set(new_button, "Add");
91
92- elm_button_label_set(sel_cat_bt, cat);
93+ elm_object_text_set(sel_cat_bt, cat);
94 strcpy(sel_category, cat);
95 elm_genlist_clear(list);
96 last_rec = -1;
97@@ -92,10 +92,10 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
98 item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li);
99 tsk = (_Task *)elm_genlist_item_data_get(item);
100 last_rec = tsk->no;
101- elm_button_label_set(cat_bt, tsk->cat);
102+ elm_object_text_set(cat_bt, tsk->cat);
103 sprintf(tystr, "%d", tsk->pr);
104- elm_button_label_set(pr_bt, tystr);
105- elm_button_label_set(date_bt, tsk->date);
106+ elm_object_text_set(pr_bt, tystr);
107+ elm_object_text_set(date_bt, tsk->date);
108 elm_entry_entry_set(tk, tsk->text);
109 if (strcmp(tsk->text, "Task") == 0) elm_entry_select_all(tk);
110 }
111@@ -109,7 +109,7 @@ void set_priority(void *data, Evas_Object *obj, void *event_info)
112 char *prio = (char *)data;
113 ty = atoi(prio);
114 sprintf(tystr, "%d", ty);
115- elm_button_label_set(pr_bt, tystr);
116+ elm_object_text_set(pr_bt, tystr);
117
118 Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
119 evas_object_hide(hv);
120@@ -134,7 +134,7 @@ void set_category(void *data, Evas_Object *obj, void *event_info)
121 _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
122 if (strcmp(tsk->cat, category) == 0) return;
123 strcpy(tsk->cat, category);
124- elm_button_label_set(cat_bt, category);
125+ elm_object_text_set(cat_bt, category);
126 WRITE = 1;
127 if (strcmp(sel_category, " All Tasks ") !=0 &&
128 strcmp(sel_category, category) != 0) elm_genlist_item_del(item);
129@@ -144,7 +144,7 @@ void set_date(void *data, Evas_Object *obj, void *event_info)
130 {
131 char *dt = (char *)data;
132 //set the date
133- elm_button_label_set(date_bt, dt);
134+ elm_object_text_set(date_bt, dt);
135 evas_object_hide(date_hs);
136 Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
137 if (!item) {
138@@ -185,7 +185,7 @@ void add_dates(Evas_Object *win, Evas_Object *bx, Evas_Object *bt)
139
140 sprintf(dt, "No Date");
141 bt = elm_button_add(win);
142- elm_button_label_set(bt,dt);
143+ elm_object_text_set(bt,dt);
144 elm_box_pack_end(bx, bt);
145 tystr = strdup(dt);
146 evas_object_smart_callback_add(bt, "clicked", set_date, (char *)tystr);
147@@ -197,7 +197,7 @@ void add_dates(Evas_Object *win, Evas_Object *bx, Evas_Object *bt)
148 strftime(dt, 6, "%d-%m", loctime);
149 //sprintf(dt, " All Tasks ");
150 bt = elm_button_add(win);
151- elm_button_label_set(bt,dt);
152+ elm_object_text_set(bt,dt);
153 elm_box_pack_end(bx, bt);
154 tystr = strdup(dt);
155 evas_object_smart_callback_add(bt, "clicked", set_date, (char *)tystr);
156@@ -206,7 +206,7 @@ void add_dates(Evas_Object *win, Evas_Object *bx, Evas_Object *bt)
157
158 sprintf(dt, "Calendar");
159 bt = elm_button_add(win);
160- elm_button_label_set(bt,dt);
161+ elm_object_text_set(bt,dt);
162 elm_box_pack_end(bx, bt);
163 tystr = strdup(dt);
164 evas_object_smart_callback_add(bt, "clicked", set_date, (char *)tystr);
165@@ -221,7 +221,7 @@ void set_create_date(void *data, Evas_Object *obj, void *event_info)
166 _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item);
167 strcpy(tsk->date, det->data);
168 //update button label
169- elm_button_label_set(det->button, det->data);
170+ elm_object_text_set(det->button, det->data);
171 WRITE = 1;
172 }
173
174@@ -233,7 +233,7 @@ void set_create_priority(void *data, Evas_Object *obj, void *event_info)
175 _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item);
176 tsk->pr = atoi(det->data);
177 //update button label
178- elm_button_label_set(det->button, det->data);
179+ elm_object_text_set(det->button, det->data);
180 WRITE = 1;
181 }
182
183@@ -320,14 +320,14 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
184
185 //add a label to frame
186 lb = elm_label_add(det_page);
187- elm_label_label_set(lb,"Edit Task Details");
188+ elm_object_text_set(lb,"Edit Task Details");
189 evas_object_size_hint_align_set(lb, 0.5, -1.0);
190 elm_frame_content_set(fr, lb);
191 evas_object_show(lb);
192
193 //add a label
194 lb = elm_label_add(det_page);
195- elm_label_label_set(lb,"Task:");
196+ elm_object_text_set(lb,"Task:");
197 evas_object_size_hint_align_set(lb, 1.0, 0.5);
198 elm_table_pack(tb, lb, 0, 1, 1, 1);
199 evas_object_show(lb);
200@@ -343,7 +343,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
201
202 //add a label to hbox
203 lb = elm_label_add(det_page);
204- elm_label_label_set(lb,"Priority:");
205+ elm_object_text_set(lb,"Priority:");
206 evas_object_size_hint_align_set(lb, 1.0, 0.5);
207 elm_table_pack(tb, lb, 0, 2, 1, 1);
208 evas_object_show(lb);
209@@ -357,7 +357,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
210
211 c_pr_bt = elm_button_add(det_page);
212 sprintf(no, "%d", tsk->pr);
213- elm_button_label_set(c_pr_bt, no);
214+ elm_object_text_set(c_pr_bt, no);
215 evas_object_smart_callback_add(c_pr_bt, "clicked", my_hover_bt_1, det_hv);
216 elm_box_pack_end(bx, c_pr_bt);
217 evas_object_show(c_pr_bt);
218@@ -365,7 +365,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
219 elm_hover_target_set(det_hv, c_pr_bt);
220
221 bt = elm_button_add(det_page);
222- elm_button_label_set(bt, "Pr");
223+ elm_object_text_set(bt, "Pr");
224 elm_hover_content_set(det_hv, "middle", bt);
225 evas_object_show(bt);
226
227@@ -377,7 +377,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
228 det[i].button = c_pr_bt;
229 bt = elm_button_add(det_page);
230 sprintf(no, "%d", i);
231- elm_button_label_set(bt, no);
232+ elm_object_text_set(bt, no);
233 elm_box_pack_end(bx, bt);
234 det[i].data = strdup(no);
235 evas_object_smart_callback_add(bt, "clicked", set_create_priority, &det[i]);
236@@ -388,7 +388,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
237
238 //add a label to hbox
239 lb = elm_label_add(det_page);
240- elm_label_label_set(lb,"Category:");
241+ elm_object_text_set(lb,"Category:");
242 evas_object_size_hint_align_set(lb, 1.0, 0.5);
243 elm_table_pack(tb, lb, 0, 3, 1, 1);
244 evas_object_show(lb);
245@@ -400,7 +400,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
246 evas_object_show(bx);
247
248 cat_bt = elm_button_add(det_page);
249- elm_button_label_set(cat_bt, tsk->cat);
250+ elm_object_text_set(cat_bt, tsk->cat);
251 evas_object_smart_callback_add(cat_bt, "clicked", my_hover_bt_1, hs);
252 elm_box_pack_end(bx, cat_bt);
253 evas_object_show(cat_bt);
254@@ -408,7 +408,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
255 elm_hover_target_set(hs, cat_bt);
256
257 bt = elm_button_add(det_page);
258- elm_button_label_set(bt, "Category");
259+ elm_object_text_set(bt, "Category");
260 elm_hover_content_set(hs, "middle", bt);
261 evas_object_show(bt);
262
263@@ -420,7 +420,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
264
265 //add a label to hbox
266 lb = elm_label_add(det_page);
267- elm_label_label_set(lb, "Date:");
268+ elm_object_text_set(lb, "Date:");
269 evas_object_size_hint_align_set(lb, 1.0, 0.5);
270 elm_table_pack(tb, lb, 0, 4, 1, 1);
271 evas_object_show(lb);
272@@ -433,7 +433,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
273 evas_object_show(bx);
274
275 c_date_bt = elm_button_add(det_page);
276- elm_button_label_set(c_date_bt, tsk->date);
277+ elm_object_text_set(c_date_bt, tsk->date);
278 evas_object_smart_callback_add(c_date_bt, "clicked", my_hover_bt_1, c_date_hs);
279 elm_box_pack_end(bx, c_date_bt);
280 evas_object_show(c_date_bt);
281@@ -441,7 +441,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
282 elm_hover_target_set(c_date_hs, c_date_bt);
283
284 bt = elm_button_add(det_page);
285- elm_button_label_set(bt, "Date");
286+ elm_object_text_set(bt, "Date");
287 elm_hover_content_set(c_date_hs, "middle", bt);
288 evas_object_show(bt);
289
290@@ -453,7 +453,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
291 det[6].button = c_date_bt;
292 sprintf(dt, "No Date");
293 bt = elm_button_add(det_page);
294- elm_button_label_set(bt,dt);
295+ elm_object_text_set(bt,dt);
296 elm_box_pack_end(bx, bt);
297 det[6].data = strdup(dt);
298 evas_object_smart_callback_add(bt, "clicked", set_create_date, &det[6]);
299@@ -467,7 +467,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
300 loctime = localtime (&tm);
301 strftime(dt, 7, "%d-%m", loctime);
302 bt = elm_button_add(det_page);
303- elm_button_label_set(bt,dt);
304+ elm_object_text_set(bt,dt);
305 elm_box_pack_end(bx, bt);
306 det[7+i].data = strdup(dt);
307 evas_object_smart_callback_add(bt, "clicked", set_create_date, &det[7+i]);
308@@ -479,7 +479,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
309 det[14].button = c_date_bt;
310 sprintf(dt, "Calendar");
311 bt = elm_button_add(det_page);
312- elm_button_label_set(bt,dt);
313+ elm_object_text_set(bt,dt);
314 elm_box_pack_end(bx, bt);
315 det[14].data = strdup(dt);
316 evas_object_smart_callback_add(bt, "clicked", set_create_date, &det[14]);
317@@ -490,7 +490,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
318
319 //add a label
320 lb = elm_label_add(det_page);
321- elm_label_label_set(lb,"Note:");
322+ elm_object_text_set(lb,"Note:");
323 evas_object_size_hint_align_set(lb, 1.0, 0.5);
324 elm_table_pack(tb, lb, 0, 5, 1, 1);
325 evas_object_show(lb);
326@@ -509,7 +509,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
327 evas_object_show(note_entry);
328
329 /*lb = elm_label_add(det_page);
330- elm_label_label_set(lb,"Note:");
331+ elm_object_text_set(lb,"Note:");
332 elm_table_pack(tb, lb, 1, 5, 2, 1);
333 evas_object_show(lb);*/
334
335@@ -523,7 +523,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
336
337 //add done button
338 bt_done = elm_button_add(det_page);
339- elm_button_label_set(bt_done, "Done");
340+ elm_object_text_set(bt_done, "Done");
341 evas_object_size_hint_weight_set(bt_done, 1.0, 0.0);
342 evas_object_size_hint_align_set(bt_done, -1.0, -1.0);
343 elm_table_pack(tb, bt_done, 0, 7, 1, 1);
344@@ -532,7 +532,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
345
346 //add del button
347 bt = elm_button_add(det_page);
348- elm_button_label_set(bt, "Delete");
349+ elm_object_text_set(bt, "Delete");
350 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
351 evas_object_size_hint_align_set(bt, -1.0, -1.0);
352 elm_table_pack(tb, bt, 1, 7, 1, 1);
353@@ -543,7 +543,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
354 //bt = elm_button_add(det_page);
355 //evas_object_size_hint_weight_set(bt, 1.0, 1.0);
356 //evas_object_size_hint_align_set(bt, -1.0, -1.0);
357- //elm_button_label_set(bt, "Note");
358+ //elm_object_text_set(bt, "Note");
359 //elm_box_pack_end(hbox1, bt);
360 //evas_object_show(bt);
361 //evas_object_smart_callback_add(bt, "clicked", det_page_add, entry);
362@@ -552,7 +552,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
363 bt = elm_button_add(det_page);
364 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
365 evas_object_size_hint_align_set(bt, -1.0, -1.0);
366- elm_button_label_set(bt, "Cancel");
367+ elm_object_text_set(bt, "Cancel");
368 elm_table_pack(tb, bt, 2, 7, 1, 1);
369 evas_object_show(bt);
370 evas_object_smart_callback_add(bt, "clicked", cat_win_del, det_page);
371@@ -674,7 +674,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
372 evas_object_size_hint_align_set(bx2, -1.0, -1.0);
373
374 bt = elm_button_add(note_win);
375- elm_button_label_set(bt, "Clear");
376+ elm_object_text_set(bt, "Clear");
377 evas_object_smart_callback_add(bt, "clicked", note_clear, en);
378 evas_object_size_hint_align_set(bt, -1.0, -1.0);
379 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
380@@ -682,7 +682,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
381 evas_object_show(bt);
382
383 //bt = elm_button_add(note_win);
384- //elm_button_label_set(bt, "Save");
385+ //elm_object_text_set(bt, "Save");
386 //evas_object_smart_callback_add(bt, "clicked", my_entry_bt_2, en);
387 //evas_object_size_hint_align_set(bt, -1.0, -1.0);
388 //evas_object_size_hint_weight_set(bt, 1.0, 0.0);
389@@ -690,7 +690,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
390 //evas_object_show(bt);
391
392 bt = elm_button_add(note_win);
393- elm_button_label_set(bt, "Cancel");
394+ elm_object_text_set(bt, "Cancel");
395 evas_object_smart_callback_add(bt, "clicked", cat_win_del, note_win);
396 evas_object_size_hint_align_set(bt, -1.0, -1.0);
397 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
398@@ -698,7 +698,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
399 evas_object_show(bt);
400
401 bt = elm_button_add(note_win);
402- elm_button_label_set(bt, "Done");
403+ elm_object_text_set(bt, "Done");
404 evas_object_smart_callback_add(bt, "clicked", note_done, en);
405 evas_object_size_hint_align_set(bt, -1.0, -1.0);
406 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
407@@ -728,7 +728,7 @@ void create_cat_hover(void)
408 //for genlist
409 Elm_Genlist_Item_Class itc1;
410
411-char *gl_label_get(const void *data, Evas_Object *obj, const char *part)
412+char *gl_text_get(const void *data, Evas_Object *obj, const char *part)
413 {
414 _Task *tsk = (_Task *)data;
415 char tystr[255], *ty;
416@@ -739,7 +739,7 @@ char *gl_label_get(const void *data, Evas_Object *obj, const char *part)
417 //return NULL;
418 }
419
420-Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
421+Evas_Object *gl_content_get(const void *data, Evas_Object *obj, const char *part)
422 {
423 _Task *tsk = (_Task *)data;
424
425@@ -759,7 +759,7 @@ Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
426 //add a label for priority
427 sprintf(txt, "%d", tsk->pr);
428 pr_lb = elm_label_add(obj);
429- elm_label_label_set(pr_lb, txt);
430+ elm_object_text_set(pr_lb, txt);
431 elm_box_pack_end(bx, pr_lb);
432 evas_object_show(pr_lb);
433 evas_object_show(bx);
434@@ -812,7 +812,7 @@ Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
435 }
436
437 lb_date = elm_label_add(obj);
438- elm_label_label_set(lb_date, tsk->date);
439+ elm_object_text_set(lb_date, tsk->date);
440 elm_box_pack_end(bx, lb_date);
441 evas_object_size_hint_weight_set(lb_date, 0.0, 0.0);
442 evas_object_size_hint_align_set(lb_date, 1.0, 0.5);
443@@ -871,7 +871,7 @@ void create_gui(Evas_Object *win)
444 evas_object_show(bx);
445
446 pr_bt = elm_button_add(win);
447- elm_button_label_set(pr_bt, "Pr");
448+ elm_object_text_set(pr_bt, "Pr");
449 evas_object_smart_callback_add(pr_bt, "clicked", my_hover_bt_1, hv);
450 elm_box_pack_end(bx, pr_bt);
451 evas_object_show(pr_bt);
452@@ -879,7 +879,7 @@ void create_gui(Evas_Object *win)
453 elm_hover_target_set(hv, pr_bt);
454
455 bt = elm_button_add(win);
456- elm_button_label_set(bt, "Pr");
457+ elm_object_text_set(bt, "Pr");
458 elm_hover_content_set(hv, "middle", bt);
459 evas_object_show(bt);
460
461@@ -888,7 +888,7 @@ void create_gui(Evas_Object *win)
462 for (i=1; i<6; i++) {
463 bt = elm_button_add(win);
464 sprintf(no, "%d", i);
465- elm_button_label_set(bt, no);
466+ elm_object_text_set(bt, no);
467 elm_box_pack_end(bx, bt);
468 tystr = strdup(no);
469 evas_object_smart_callback_add(bt, "clicked", set_priority, (char *)tystr);
470@@ -925,7 +925,7 @@ void create_gui(Evas_Object *win)
471 evas_object_show(bx1);
472
473 date_bt = elm_button_add(win);
474- elm_button_label_set(date_bt, "Date");
475+ elm_object_text_set(date_bt, "Date");
476 evas_object_smart_callback_add(date_bt, "clicked", my_hover_bt_1, date_hs);
477 elm_box_pack_end(bx1, date_bt);
478 evas_object_show(date_bt);
479@@ -933,7 +933,7 @@ void create_gui(Evas_Object *win)
480 elm_hover_target_set(date_hs, date_bt);
481
482 bt = elm_button_add(win);
483- elm_button_label_set(bt, "Date");
484+ elm_object_text_set(bt, "Date");
485 elm_hover_content_set(date_hs, "middle", bt);
486 evas_object_show(bt);
487
488@@ -944,7 +944,7 @@ void create_gui(Evas_Object *win)
489
490 //add save button
491 save_button = elm_button_add(win);
492- elm_button_label_set(save_button, "Save");
493+ elm_object_text_set(save_button, "Save");
494 evas_object_size_hint_weight_set(save_button, 0.0, 0.0);
495 evas_object_size_hint_align_set(save_button, 1.0, -1.0);
496 elm_box_pack_end(hbox, save_button);
497@@ -963,8 +963,8 @@ void create_gui(Evas_Object *win)
498
499 //genlist class defs
500 itc1.item_style = "default";
501- itc1.func.label_get = gl_label_get;
502- itc1.func.icon_get = gl_icon_get;
503+ itc1.func.text_get = gl_text_get;
504+ itc1.func.content_get = gl_content_get;
505 itc1.func.state_get = gl_state_get;
506 itc1.func.del = gl_del;
507
508@@ -978,7 +978,7 @@ void create_gui(Evas_Object *win)
509
510 //add new button to the hbox
511 new_button = elm_button_add(win);
512- elm_button_label_set(new_button, "Add");
513+ elm_object_text_set(new_button, "Add");
514 evas_object_size_hint_weight_set(new_button, 1.0, 1.0);
515 evas_object_size_hint_align_set(new_button, -1.0, -1.0);
516 elm_box_pack_end(hbox1, new_button);
517@@ -987,7 +987,7 @@ void create_gui(Evas_Object *win)
518
519 //add Properties button to the hbox
520 prop_button = elm_button_add(win);
521- elm_button_label_set(prop_button, "Details");
522+ elm_object_text_set(prop_button, "Details");
523 evas_object_size_hint_weight_set(prop_button, 1.0, 1.0);
524 evas_object_size_hint_align_set(prop_button, -1.0, -1.0);
525 elm_box_pack_end(hbox1, prop_button);
526@@ -1000,9 +1000,9 @@ void create_gui(Evas_Object *win)
527 snprintf(buf, sizeof(buf), "/usr/share/e-tasks/note_butt.png");
528 elm_icon_file_set(ic, buf, NULL);
529 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
530- elm_button_icon_set(note_button, ic);
531+ elm_object_content_set(note_button, ic);
532 evas_object_show(ic);
533- //elm_button_label_set(note_button, "Note");
534+ //elm_object_text_set(note_button, "Note");
535 evas_object_size_hint_weight_set(note_button, 1.0, 1.0);
536 evas_object_size_hint_align_set(note_button, -1.0, -1.0);
537 elm_box_pack_end(hbox1, note_button);
538@@ -1018,7 +1018,7 @@ void create_gui(Evas_Object *win)
539 evas_object_show(bx);
540
541 sel_cat_bt = elm_button_add(win);
542- elm_button_label_set(sel_cat_bt, " All Tasks ");
543+ elm_object_text_set(sel_cat_bt, " All Tasks ");
544 evas_object_smart_callback_add(sel_cat_bt, "clicked", my_hover_bt_1, hs1);
545 elm_box_pack_end(bx, sel_cat_bt);
546 evas_object_show(sel_cat_bt);
547@@ -1026,7 +1026,7 @@ void create_gui(Evas_Object *win)
548 elm_hover_target_set(hs1, sel_cat_bt);
549
550 bt = elm_button_add(win);
551- elm_button_label_set(bt, " All Tasks ");
552+ elm_object_text_set(bt, " All Tasks ");
553 elm_hover_content_set(hs1, "middle", bt);
554 evas_object_show(bt);
555 create_cat_hover ();
556@@ -1131,7 +1131,7 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info)
557
558 //add a label to hbox
559 lb = elm_label_add(cat_dialog);
560- elm_label_label_set(lb,"Category:");
561+ elm_object_text_set(lb,"Category:");
562 elm_box_pack_end(hbox, lb);
563 evas_object_show(lb);
564
565@@ -1149,13 +1149,13 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info)
566 //add another hbox
567 hbox1 = elm_box_add(cat_dialog);
568 elm_box_horizontal_set(hbox1, 1);
569- elm_box_homogenous_set(hbox1, 1);
570+ elm_box_homogeneous_set(hbox1, 1);
571 elm_box_pack_end(vbox, hbox1);
572 evas_object_show(hbox1);
573
574 //add yes button
575 bt = elm_button_add(cat_dialog);
576- elm_button_label_set(bt, "Add");
577+ elm_object_text_set(bt, "Add");
578 evas_object_size_hint_align_set(bt, -1.0, -1.0);
579 elm_box_pack_end(hbox1, bt);
580 evas_object_show(bt);
581@@ -1163,7 +1163,7 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info)
582
583 //add close button
584 bt1 = elm_button_add(cat_dialog);
585- elm_button_label_set(bt1, "Cancel");
586+ elm_object_text_set(bt1, "Cancel");
587 elm_box_pack_end(hbox1, bt1);
588 evas_object_show(bt1);
589 evas_object_smart_callback_add(bt1, "clicked", cat_win_del, cat_dialog);
590@@ -1203,14 +1203,14 @@ void del_cat_button_clicked(void *data, Evas_Object *obj, void *event_info)
591 if(strcmp(sel_category, _cat) == 0) select_category (" All Tasks ", NULL, NULL);
592 }
593
594-char *cat_label_get(const void *data, Evas_Object *obj, const char *part)
595+char *cat_text_get(const void *data, Evas_Object *obj, const char *part)
596 {
597 char *_cat = (char *)data;
598 char *ty = strdup(_cat);
599 return (ty);
600 }
601
602-Evas_Object *cat_icon_get(const void *data, Evas_Object *obj, const char *part)
603+Evas_Object *cat_content_get(const void *data, Evas_Object *obj, const char *part)
604 {
605 return NULL;
606 }
607@@ -1262,7 +1262,7 @@ void edit_cat(void)
608
609 // add a label
610 lb = elm_label_add(cat_win);
611- elm_label_label_set(lb, "Task Categories");
612+ elm_object_text_set(lb, "Task Categories");
613 elm_frame_content_set(fr, lb);
614 evas_object_show(lb);
615
616@@ -1277,8 +1277,8 @@ void edit_cat(void)
617
618 //genlist class defs
619 itc2.item_style = "default";
620- itc2.func.label_get = cat_label_get;
621- itc2.func.icon_get = cat_icon_get;
622+ itc2.func.text_get = cat_text_get;
623+ itc2.func.content_get = cat_content_get;
624 itc2.func.state_get = cat_state_get;
625 itc2.func.del = cat_del;
626
627@@ -1292,7 +1292,7 @@ void edit_cat(void)
628
629 //add button to add categories
630 add_cat_button = elm_button_add(cat_win);
631- elm_button_label_set(add_cat_button, "Add");
632+ elm_object_text_set(add_cat_button, "Add");
633 evas_object_size_hint_weight_set(add_cat_button, 1.0, 1.0);
634 evas_object_size_hint_align_set(add_cat_button, -1.0, -1.0);
635 elm_box_pack_end(hbox, add_cat_button);
636@@ -1301,7 +1301,7 @@ void edit_cat(void)
637
638 //add button to del categories
639 del_cat_button = elm_button_add(cat_win);
640- elm_button_label_set(del_cat_button, "Delete");
641+ elm_object_text_set(del_cat_button, "Delete");
642 evas_object_size_hint_weight_set(del_cat_button, 1.0, 1.0);
643 evas_object_size_hint_align_set(del_cat_button, -1.0, -1.0);
644 elm_box_pack_end(hbox, del_cat_button);
645@@ -1310,7 +1310,7 @@ void edit_cat(void)
646
647 //add done button
648 done_button = elm_button_add(cat_win);
649- elm_button_label_set(done_button, "Done");
650+ elm_object_text_set(done_button, "Done");
651 evas_object_size_hint_weight_set(done_button, 1.0, 1.0);
652 evas_object_size_hint_align_set(done_button, -1.0, -1.0);
653 elm_box_pack_end(hbox, done_button);
654--
6551.7.8
656
diff --git a/meta-efl/recipes-efl/e17/e-tasks_svn.bb b/meta-efl/recipes-efl/e17/e-tasks_svn.bb
index b79353b27..b07959bfe 100644
--- a/meta-efl/recipes-efl/e17/e-tasks_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-tasks_svn.bb
@@ -10,10 +10,11 @@ inherit autotools
10 10
11SRCREV = "25" 11SRCREV = "25"
12PV = "0.0.1+svnr${SRCPV}" 12PV = "0.0.1+svnr${SRCPV}"
13PR = "r9" 13PR = "r10"
14 14
15SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http \ 15SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http \
16 file://genlist_item_insert_before.api.patch \ 16 file://genlist_item_insert_before.api.patch \
17 file://0001-adapt-to-newer-elm-API.patch \
17 file://depends.eina.patch" 18 file://depends.eina.patch"
18S = "${WORKDIR}/trunk" 19S = "${WORKDIR}/trunk"
19 20
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-21 20:08:12 +0000