diff options
Diffstat (limited to 'meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch')
| -rw-r--r-- | meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch | 182 |
1 files changed, 0 insertions, 182 deletions
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch b/meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch deleted file mode 100644 index 2ea576f211..0000000000 --- a/meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch +++ /dev/null | |||
| @@ -1,182 +0,0 @@ | |||
| 1 | From aa1ac5f8d2133ae04099a155811b65733447e34d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Tue, 14 Feb 2012 20:51:09 +0100 | ||
| 4 | Subject: [PATCH 5/8] adapt to even newer elm API | ||
| 5 | |||
| 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 7 | --- | ||
| 8 | src/db_sqlite.c | 2 +- | ||
| 9 | src/db_sqlite.h | 2 +- | ||
| 10 | src/gui.c | 30 +++++++++++++++--------------- | ||
| 11 | src/main.c | 2 +- | ||
| 12 | 4 files changed, 18 insertions(+), 18 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/src/db_sqlite.c b/src/db_sqlite.c | ||
| 15 | index fde2181..3eb7790 100644 | ||
| 16 | --- a/src/db_sqlite.c | ||
| 17 | +++ b/src/db_sqlite.c | ||
| 18 | @@ -192,7 +192,7 @@ void load_data(void) | ||
| 19 | void show_cat_tasks(char *ca) | ||
| 20 | { | ||
| 21 | int i; | ||
| 22 | - Elm_Genlist_Item *item; | ||
| 23 | + Elm_Object_Item *item; | ||
| 24 | |||
| 25 | elm_genlist_clear(list); | ||
| 26 | if (strcmp(ca, " All Tasks ") == 0) { | ||
| 27 | diff --git a/src/db_sqlite.h b/src/db_sqlite.h | ||
| 28 | index b595488..469aa48 100644 | ||
| 29 | --- a/src/db_sqlite.h | ||
| 30 | +++ b/src/db_sqlite.h | ||
| 31 | @@ -39,7 +39,7 @@ extern Evas_Object *list, *hs, *hs1, *cat_list, *sel_cat_bt; | ||
| 32 | void restore_state(void); | ||
| 33 | extern char home_dir[255], sel_category[255]; | ||
| 34 | extern Elm_Genlist_Item_Class itc1, itc2; | ||
| 35 | -extern Elm_Genlist_Item *task_list[500]; | ||
| 36 | +extern Elm_Object_Item *task_list[500]; | ||
| 37 | extern int total_tasks; | ||
| 38 | typedef struct{ | ||
| 39 | int no; | ||
| 40 | diff --git a/src/gui.c b/src/gui.c | ||
| 41 | index 69b06d8..0291378 100644 | ||
| 42 | --- a/src/gui.c | ||
| 43 | +++ b/src/gui.c | ||
| 44 | @@ -26,7 +26,7 @@ char dummy_cat[255]; | ||
| 45 | |||
| 46 | typedef struct _Details | ||
| 47 | { | ||
| 48 | - Elm_Genlist_Item *item; | ||
| 49 | + Elm_Object_Item *item; | ||
| 50 | Evas_Object *button; | ||
| 51 | Evas_Object *hover; | ||
| 52 | char *data; | ||
| 53 | @@ -67,7 +67,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info) | ||
| 54 | { | ||
| 55 | char tystr[2]; | ||
| 56 | char te_data[255], *task_entry; | ||
| 57 | - Elm_Genlist_Item *item; | ||
| 58 | + Elm_Object_Item *item; | ||
| 59 | _Task *tsk=NULL; | ||
| 60 | |||
| 61 | //for entries, get entry data and check agianst previous task text, date | ||
| 62 | @@ -89,7 +89,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info) | ||
| 63 | } | ||
| 64 | |||
| 65 | Evas_Object *li = data; | ||
| 66 | - item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li); | ||
| 67 | + item = (Elm_Object_Item *)elm_genlist_selected_item_get(li); | ||
| 68 | tsk = (_Task *)elm_genlist_item_data_get(item); | ||
| 69 | last_rec = tsk->no; | ||
| 70 | elm_object_text_set(cat_bt, tsk->cat); | ||
| 71 | @@ -111,7 +111,7 @@ void set_priority(void *data, Evas_Object *obj, void *event_info) | ||
| 72 | sprintf(tystr, "%d", ty); | ||
| 73 | elm_object_text_set(pr_bt, tystr); | ||
| 74 | |||
| 75 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 76 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 77 | evas_object_hide(hv); | ||
| 78 | if (!item) { | ||
| 79 | dummy_pr = atoi(prio); | ||
| 80 | @@ -125,10 +125,10 @@ void set_priority(void *data, Evas_Object *obj, void *event_info) | ||
| 81 | |||
| 82 | void set_category(void *data, Evas_Object *obj, void *event_info) | ||
| 83 | { | ||
| 84 | - Elm_Genlist_Item *item; | ||
| 85 | + Elm_Object_Item *item; | ||
| 86 | //change category value of selected task | ||
| 87 | char *category = data; | ||
| 88 | - item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 89 | + item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 90 | evas_object_hide(hs); | ||
| 91 | if (!item) return; | ||
| 92 | _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
| 93 | @@ -146,7 +146,7 @@ void set_date(void *data, Evas_Object *obj, void *event_info) | ||
| 94 | //set the date | ||
| 95 | elm_object_text_set(date_bt, dt); | ||
| 96 | evas_object_hide(date_hs); | ||
| 97 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 98 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 99 | if (!item) { | ||
| 100 | strcpy(dummy_date, dt); | ||
| 101 | return; | ||
| 102 | @@ -260,8 +260,8 @@ void det_page_done(void *data, Evas_Object *obj, void *event_info) | ||
| 103 | if(WRITE) { | ||
| 104 | WRITE = 0; | ||
| 105 | update_record (tsk->no); | ||
| 106 | - Elm_Genlist_Item *item; | ||
| 107 | - item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 108 | + Elm_Object_Item *item; | ||
| 109 | + item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 110 | if(item) elm_genlist_item_update(task_list[tsk->no]); | ||
| 111 | last_rec = -1; | ||
| 112 | item = elm_genlist_first_item_get(list); | ||
| 113 | @@ -293,7 +293,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info) | ||
| 114 | curtime = time (NULL); | ||
| 115 | |||
| 116 | //check task selected - otherwise return | ||
| 117 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 118 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 119 | if(!item) return; | ||
| 120 | _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
| 121 | det_page = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); | ||
| 122 | @@ -566,7 +566,7 @@ void save_button_clicked(void *data, Evas_Object *obj, void *event_info) | ||
| 123 | char te_data[255], *task_entry; | ||
| 124 | |||
| 125 | //get task no | ||
| 126 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 127 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 128 | if (item) { | ||
| 129 | _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
| 130 | |||
| 131 | @@ -626,7 +626,7 @@ void note_done(void *data, Evas_Object *obj, void *event_info) | ||
| 132 | char tystr[255]; | ||
| 133 | //Evas_Object *en = data; | ||
| 134 | |||
| 135 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 136 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 137 | _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
| 138 | sprintf(tystr, "%s", elm_entry_entry_get(data)); | ||
| 139 | if (strcmp(tystr, "<br>") == 0) strcpy(tystr, ""); | ||
| 140 | @@ -641,7 +641,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info) | ||
| 141 | Evas_Object *bg, *bx, *bx2, *bt, *en; | ||
| 142 | //char buf[PATH_MAX]; | ||
| 143 | |||
| 144 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list); | ||
| 145 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list); | ||
| 146 | if(!item) return; | ||
| 147 | _Task *tsk = (_Task *)elm_genlist_item_data_get(item); | ||
| 148 | |||
| 149 | @@ -1056,7 +1056,7 @@ void create_new_task(void *data, Evas_Object *obj, void *event_info) | ||
| 150 | |||
| 151 | //get selected task if any | ||
| 152 | Evas_Object *li = data; | ||
| 153 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li); | ||
| 154 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(li); | ||
| 155 | if (!item) item = elm_genlist_last_item_get(list); //insert new line at end of list | ||
| 156 | |||
| 157 | Task[i].no = i; | ||
| 158 | @@ -1193,7 +1193,7 @@ void cat_list_selected(void *data, Evas_Object *obj, void *event_info) | ||
| 159 | void del_cat_button_clicked(void *data, Evas_Object *obj, void *event_info) | ||
| 160 | { | ||
| 161 | Evas_Object *li = data; | ||
| 162 | - Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li); | ||
| 163 | + Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(li); | ||
| 164 | char *_cat = (char *)elm_genlist_item_data_get(item); | ||
| 165 | //delete category from db | ||
| 166 | del_category(_cat); | ||
| 167 | diff --git a/src/main.c b/src/main.c | ||
| 168 | index 116b84c..89bbb39 100644 | ||
| 169 | --- a/src/main.c | ||
| 170 | +++ b/src/main.c | ||
| 171 | @@ -27,7 +27,7 @@ | ||
| 172 | #include "db_sqlite.h" | ||
| 173 | |||
| 174 | char home_dir[255], sel_category[255]; | ||
| 175 | -Elm_Genlist_Item *task_list[500]; | ||
| 176 | +Elm_Object_Item *task_list[500]; | ||
| 177 | Evas_Object *list, *hs, *pr_hs, *date_hs, *entry, *hs1, *tk, *hv, *pr_bt, *cat_list, *win, *cat_hv_bx, *note_win; | ||
| 178 | Evas_Object *c_pr_bt, *cat_dialog, *cat_bt, *sel_cat_bt, *date_bt, *det_page, *entry, *new_button, *note_entry; | ||
| 179 | int total_tasks, WRITE=0, last_rec= -1; | ||
| 180 | -- | ||
| 181 | 1.7.8.4 | ||
| 182 | |||
