diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/extantz.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 09b5196..ab09fd0 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -39,7 +39,7 @@ static Elm_Genlist_Item_Class *viewer_gic = NULL; | |||
39 | 39 | ||
40 | //static const char *img1 = PACKAGE_DATA_DIR "/media/plant_01.jpg"; | 40 | //static const char *img1 = PACKAGE_DATA_DIR "/media/plant_01.jpg"; |
41 | //static const char *img2 = PACKAGE_DATA_DIR "/media/sky_01.jpg"; | 41 | //static const char *img2 = PACKAGE_DATA_DIR "/media/sky_01.jpg"; |
42 | static const char *img3 = PACKAGE_DATA_DIR "/media/rock_01.jpg"; | 42 | static const char *img3 = "rock_01.jpg"; |
43 | 43 | ||
44 | 44 | ||
45 | #define EPHYSICS_TEST_THEME "extantz" | 45 | #define EPHYSICS_TEST_THEME "extantz" |
@@ -1240,7 +1240,7 @@ static void woMan_add(GLData *gld) | |||
1240 | // Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 1240 | // Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
1241 | Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 1241 | Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
1242 | Elm_Object_Item *tb_it, *menu_it, *tab_it; | 1242 | Elm_Object_Item *tb_it, *menu_it, *tab_it; |
1243 | // char buf[PATH_MAX]; | 1243 | char buf[PATH_MAX]; |
1244 | int i; | 1244 | int i; |
1245 | 1245 | ||
1246 | win = fang_win_add(gld); | 1246 | win = fang_win_add(gld); |
@@ -1351,9 +1351,10 @@ static void woMan_add(GLData *gld) | |||
1351 | evas_object_size_hint_weight_set(nf, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 1351 | evas_object_size_hint_weight_set(nf, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
1352 | evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL); | 1352 | evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL); |
1353 | evas_object_show(nf); | 1353 | evas_object_show(nf); |
1354 | 1354 | ||
1355 | sprintf(buf, "%s/%s", elm_app_data_dir_get(), img3); | ||
1355 | 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); | 1356 | 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); |
1356 | tab = _content_image_new(win, img3); 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); | 1357 | 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); |
1357 | 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); | 1358 | 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); |
1358 | elm_box_pack_end(bx, nf); | 1359 | elm_box_pack_end(bx, nf); |
1359 | 1360 | ||
@@ -1393,7 +1394,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1393 | EPhysics_Body *box_body1, *box_body2; | 1394 | EPhysics_Body *box_body1, *box_body2; |
1394 | Evas_Object *box1, *box2; | 1395 | Evas_Object *box1, *box2; |
1395 | GLData *gld = NULL; | 1396 | GLData *gld = NULL; |
1396 | // char buf[PATH_MAX]; | 1397 | char buf[PATH_MAX]; |
1397 | // int i; | 1398 | // int i; |
1398 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. | 1399 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. |
1399 | 1400 | ||
@@ -1401,10 +1402,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1401 | // Don't do this, we need to clean up other stuff to, so set a clean up function below. | 1402 | // Don't do this, we need to clean up other stuff to, so set a clean up function below. |
1402 | //elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); | 1403 | //elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); |
1403 | 1404 | ||
1404 | // If you want efl to handle finding your bin/lib/data dirs, you must do this below. | 1405 | HamrTime(elm_main, "extantz"); |
1405 | elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); | ||
1406 | elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); | ||
1407 | elm_app_info_set(elm_main, "datadir", "media/sky_03.jpg"); | ||
1408 | fprintf(stdout, "prefix was set to: %s\n", elm_app_prefix_dir_get()); | 1406 | fprintf(stdout, "prefix was set to: %s\n", elm_app_prefix_dir_get()); |
1409 | fprintf(stdout, "data directory is: %s\n", elm_app_data_dir_get()); | 1407 | fprintf(stdout, "data directory is: %s\n", elm_app_data_dir_get()); |
1410 | fprintf(stdout, "library directory is: %s\n", elm_app_lib_dir_get()); | 1408 | fprintf(stdout, "library directory is: %s\n", elm_app_lib_dir_get()); |
@@ -1538,7 +1536,8 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1538 | ephysics_body_friction_set(boundary, 0); | 1536 | ephysics_body_friction_set(boundary, 0); |
1539 | 1537 | ||
1540 | box1 = elm_image_add(gld->win); | 1538 | box1 = elm_image_add(gld->win); |
1541 | elm_image_file_set(box1, PACKAGE_DATA_DIR "/media/" EPHYSICS_TEST_THEME ".edj", "blue-cube"); | 1539 | sprintf(buf, "%s/%s.edj", elm_app_data_dir_get(), EPHYSICS_TEST_THEME); |
1540 | elm_image_file_set(box1, strdup(buf), "blue-cube"); | ||
1542 | evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200); | 1541 | evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200); |
1543 | evas_object_resize(box1, 70, 70); | 1542 | evas_object_resize(box1, 70, 70); |
1544 | evas_object_show(box1); | 1543 | evas_object_show(box1); |
@@ -1552,7 +1551,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1552 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); | 1551 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); |
1553 | 1552 | ||
1554 | box2 = elm_image_add(gld->win); | 1553 | box2 = elm_image_add(gld->win); |
1555 | elm_image_file_set(box2, PACKAGE_DATA_DIR "/media/" EPHYSICS_TEST_THEME ".edj", "purple-cube"); | 1554 | elm_image_file_set(box2, strdup(buf), "purple-cube"); |
1556 | evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200); | 1555 | evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200); |
1557 | evas_object_resize(box2, 70, 70); | 1556 | evas_object_resize(box2, 70, 70); |
1558 | evas_object_show(box2); | 1557 | evas_object_show(box2); |