diff options
Diffstat (limited to 'src/extantz/woMan.c')
-rw-r--r-- | src/extantz/woMan.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 8215253..cd1d5c8 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -154,18 +154,13 @@ static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) | |||
154 | winFang *woMan_add(globals *ourGlobals) | 154 | winFang *woMan_add(globals *ourGlobals) |
155 | { | 155 | { |
156 | winFang *me; | 156 | winFang *me; |
157 | Evas_Object *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 157 | Evas_Object *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 | me = winFangAdd(ourGlobals->mainWindow, 30, 150, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan"); | 162 | me = winFangAdd(ourGlobals->mainWindow, 30, 150, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan"); |
163 | 163 | ||
164 | bx = elm_box_add(me->win); | ||
165 | elm_win_resize_object_add(me->win, bx); | ||
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); | ||
168 | |||
169 | // A tab thingy. | 164 | // A tab thingy. |
170 | tb = elm_toolbar_add(me->win); | 165 | tb = elm_toolbar_add(me->win); |
171 | evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0); | 166 | evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0); |
@@ -189,7 +184,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
189 | elm_menu_item_add(menu, menu_it, NULL, "debug settings", NULL, NULL); | 184 | elm_menu_item_add(menu, menu_it, NULL, "debug settings", NULL, NULL); |
190 | 185 | ||
191 | // The toolbar needs to be packed into the box AFTER the menus are added. | 186 | // The toolbar needs to be packed into the box AFTER the menus are added. |
192 | elm_box_pack_end(bx, tb); | 187 | elm_box_pack_end(me->box, tb); |
193 | evas_object_show(tb); | 188 | evas_object_show(tb); |
194 | 189 | ||
195 | gridList = elm_genlist_add(me->win); | 190 | gridList = elm_genlist_add(me->win); |
@@ -272,7 +267,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
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); | 267 | 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(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); | 268 | 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); | 269 | 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); | 270 | elm_box_pack_end(me->box, nf); |
276 | 271 | ||
277 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, | 272 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, |
278 | // evas_obj_text_set("Login"), | 273 | // evas_obj_text_set("Login"), |
@@ -282,9 +277,9 @@ winFang *woMan_add(globals *ourGlobals) | |||
282 | ); | 277 | ); |
283 | 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. |
284 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); | 279 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); |
285 | elm_box_pack_end(bx, bt); | 280 | elm_box_pack_end(me->box, bt); |
286 | eo_unref(bt); | 281 | eo_unref(bt); |
287 | evas_object_show(bx); | 282 | evas_object_show(me->box); |
288 | 283 | ||
289 | return me; | 284 | return me; |
290 | } | 285 | } |