diff options
Diffstat (limited to 'src/extantz/woMan.c')
-rw-r--r-- | src/extantz/woMan.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 2e5e741..ffb063c 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -151,23 +151,23 @@ static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) | |||
151 | } | 151 | } |
152 | 152 | ||
153 | 153 | ||
154 | void woMan_add(globals *ourGlobals) | 154 | fangWin *woMan_add(globals *ourGlobals) |
155 | { | 155 | { |
156 | // Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 156 | fangWin *me; |
157 | Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 157 | Evas_Object *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
158 | Elm_Object_Item *tb_it, *menu_it, *tab_it; | 158 | Elm_Object_Item *tb_it, *menu_it, *tab_it; |
159 | char buf[PATH_MAX]; | 159 | char buf[PATH_MAX]; |
160 | int i; | 160 | int i; |
161 | 161 | ||
162 | win = fang_win_add(ourGlobals); | 162 | me = fang_win_add(ourGlobals); |
163 | 163 | ||
164 | bx = elm_box_add(win); | 164 | bx = elm_box_add(me->win); |
165 | elm_win_resize_object_add(win, bx); | 165 | elm_win_resize_object_add(me->win, bx); |
166 | evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 166 | evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
167 | evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); | 167 | evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); |
168 | 168 | ||
169 | // A tab thingy. | 169 | // A tab thingy. |
170 | tb = elm_toolbar_add(win); | 170 | tb = elm_toolbar_add(me->win); |
171 | evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0); | 171 | evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0); |
172 | evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); | 172 | evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); |
173 | elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL); | 173 | elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL); |
@@ -177,7 +177,7 @@ void woMan_add(globals *ourGlobals) | |||
177 | elm_toolbar_item_menu_set(tb_it, EINA_TRUE); | 177 | elm_toolbar_item_menu_set(tb_it, EINA_TRUE); |
178 | // Priority is for when toolbar items are set to hide or menu when there are too many of them. They get hidden or put on the menu based on priority. | 178 | // Priority is for when toolbar items are set to hide or menu when there are too many of them. They get hidden or put on the menu based on priority. |
179 | elm_toolbar_item_priority_set(tb_it, 9999); | 179 | elm_toolbar_item_priority_set(tb_it, 9999); |
180 | elm_toolbar_menu_parent_set(tb, win); | 180 | elm_toolbar_menu_parent_set(tb, me->win); |
181 | menu = elm_toolbar_item_menu_get(tb_it); | 181 | menu = elm_toolbar_item_menu_get(tb_it); |
182 | 182 | ||
183 | menu_it = elm_menu_item_add(menu, NULL, NULL, "edit", NULL, NULL); | 183 | menu_it = elm_menu_item_add(menu, NULL, NULL, "edit", NULL, NULL); |
@@ -192,7 +192,7 @@ void woMan_add(globals *ourGlobals) | |||
192 | elm_box_pack_end(bx, tb); | 192 | elm_box_pack_end(bx, tb); |
193 | evas_object_show(tb); | 193 | evas_object_show(tb); |
194 | 194 | ||
195 | gridList = elm_genlist_add(win); | 195 | gridList = elm_genlist_add(me->win); |
196 | grids = eina_hash_stringshared_new(free); | 196 | grids = eina_hash_stringshared_new(free); |
197 | evas_object_data_set(gridList, "glob", ourGlobals); | 197 | evas_object_data_set(gridList, "glob", ourGlobals); |
198 | 198 | ||
@@ -241,7 +241,7 @@ void woMan_add(globals *ourGlobals) | |||
241 | } | 241 | } |
242 | 242 | ||
243 | // Viewers stuff | 243 | // Viewers stuff |
244 | viewerList = elm_genlist_add(win); | 244 | viewerList = elm_genlist_add(me->win); |
245 | viewer_gic = elm_genlist_item_class_new(); | 245 | viewer_gic = elm_genlist_item_class_new(); |
246 | viewer_gic->item_style = "double_label"; | 246 | viewer_gic->item_style = "double_label"; |
247 | viewer_gic->func.text_get = _viewer_label_get; | 247 | viewer_gic->func.text_get = _viewer_label_get; |
@@ -263,18 +263,18 @@ void woMan_add(globals *ourGlobals) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | // Toolbar pages | 265 | // Toolbar pages |
266 | nf = elm_naviframe_add(win); | 266 | nf = elm_naviframe_add(me->win); |
267 | evas_object_size_hint_weight_set(nf, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 267 | evas_object_size_hint_weight_set(nf, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
268 | evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL); | 268 | evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL); |
269 | evas_object_show(nf); | 269 | evas_object_show(nf); |
270 | 270 | ||
271 | sprintf(buf, "%s/%s", elm_app_data_dir_get(), img3); | 271 | sprintf(buf, "%s/%s", elm_app_data_dir_get(), img3); |
272 | tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it); | 272 | tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it); |
273 | tab = _content_image_new(win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it); | 273 | tab = _content_image_new(me->win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it); |
274 | tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it); | 274 | tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it); |
275 | elm_box_pack_end(bx, nf); | 275 | elm_box_pack_end(bx, nf); |
276 | 276 | ||
277 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, win); | 277 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win); |
278 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. | 278 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. |
279 | eo_do(bt, | 279 | eo_do(bt, |
280 | // evas_obj_text_set("Login"), | 280 | // evas_obj_text_set("Login"), |
@@ -287,5 +287,6 @@ void woMan_add(globals *ourGlobals) | |||
287 | eo_unref(bt); | 287 | eo_unref(bt); |
288 | evas_object_show(bx); | 288 | evas_object_show(bx); |
289 | 289 | ||
290 | fang_win_complete(ourGlobals, win, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3); | 290 | fang_win_complete(ourGlobals, me, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3); |
291 | return me; | ||
291 | } | 292 | } |