diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/extantz.c | 77 |
1 files changed, 34 insertions, 43 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index bb67e62..7fc2d81 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -467,8 +467,6 @@ static winFang *_makeMainMenu(globals *ourGlobals) | |||
467 | it = elm_toolbar_item_append(tb, NoIcon, NULL, NULL, NULL); elm_toolbar_item_separator_set(it, EINA_TRUE); | 467 | it = elm_toolbar_item_append(tb, NoIcon, NULL, NULL, NULL); elm_toolbar_item_separator_set(it, EINA_TRUE); |
468 | it = elm_toolbar_item_append(tb, NoIcon, "date time:o'clock", NULL, NULL); | 468 | it = elm_toolbar_item_append(tb, NoIcon, "date time:o'clock", NULL, NULL); |
469 | 469 | ||
470 | elm_layout_box_prepend(me->layout, WF_BOX, tb); | ||
471 | |||
472 | return me; | 470 | return me; |
473 | } | 471 | } |
474 | 472 | ||
@@ -588,7 +586,6 @@ static Eina_Bool _makeSkang(void *data) | |||
588 | EAPI_MAIN int elm_main(int argc, char **argv) | 586 | EAPI_MAIN int elm_main(int argc, char **argv) |
589 | { | 587 | { |
590 | GLData *gld = NULL; | 588 | GLData *gld = NULL; |
591 | char buf[PATH_MAX * 2]; | ||
592 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. | 589 | // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. |
593 | 590 | ||
594 | logDom = HamrTime(argv[0], elm_main, logDom); | 591 | logDom = HamrTime(argv[0], elm_main, logDom); |
@@ -658,16 +655,19 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
658 | ELM_WIN_BASIC | 655 | ELM_WIN_BASIC |
659 | ELM_LAYOUT_CLASS WF_LAYOUT | 656 | ELM_LAYOUT_CLASS WF_LAYOUT |
660 | winFang.edc | 657 | winFang.edc |
661 | IMAGE background - semi transparent dark purple image. | 658 | SWALLOW WF_BACKGROUND |
662 | ? SWALLOW underlay | 659 | SWALLOW WF_UNDERLAY |
663 | SWALLOW title | 660 | SWALLOW WF_TITLE |
664 | Details change if it's internal. | 661 | Only visible if it's internal. |
665 | BOX box | 662 | SWALLOW WF_TOOLBAR |
666 | Details change if it's internal. | 663 | Only visible if it's got a menu. |
667 | ? SWALLOW content | 664 | SWALLOW WF_BOX |
668 | ? ELM_GRID_CLASS WF_SWALLOW | 665 | Vertical box. |
669 | 666 | SWALLOW WF_GRID | |
670 | ? ELM_BG_CLASS Sky background image. | 667 | ELM_BG_CLASS Evas_3D specific background, attached directly to window, not swallowed. |
668 | ELM_BOX_CLASS Swallowed by WF_BOX | ||
669 | isMain signal sent to layout. | ||
670 | ELM_GRID_CLASS Swallowed by WF_GRID | ||
671 | 671 | ||
672 | Extra stuff added here by init_evas_gl() if we are doing gears or Irrlicht. | 672 | Extra stuff added here by init_evas_gl() if we are doing gears or Irrlicht. |
673 | ? Elm glview Irrlicht / gears target GLView. | 673 | ? Elm glview Irrlicht / gears target GLView. |
@@ -684,8 +684,10 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
684 | require skang by default | 684 | require skang by default |
685 | require skang | 685 | require skang |
686 | ? require purkle | 686 | ? require purkle |
687 | Eventually uses WF_GRID for widget layout, though could in future use WF_BOX for some of them. | ||
687 | files.c | 688 | files.c |
688 | winFang A normally hidden window with a file requestor, and other Elm widgets. | 689 | winFang A normally hidden window with a file requestor, and other Elm widgets. |
690 | ? elm_layout_box_append(me->win, WF_BOX, vbox); | ||
689 | scenriAdd() | 691 | scenriAdd() |
690 | 3D scene and node stuff | 692 | 3D scene and node stuff |
691 | ELM_IMAGE_CLASS Evas_3D render target. | 693 | ELM_IMAGE_CLASS Evas_3D render target. |
@@ -701,6 +703,8 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
701 | winFang World manager internal window, with it's own menu and toolbar stuff. | 703 | winFang World manager internal window, with it's own menu and toolbar stuff. |
702 | Uses the same menu code as the main menus below. | 704 | Uses the same menu code as the main menus below. |
703 | But with added pager stuff. | 705 | But with added pager stuff. |
706 | elm_layout_box_append(me->win, WF_BOX, nf); Elm naviframe for the tab pages. | ||
707 | elm_layout_box_append(me->win, WF_BOX, bt); Elm Login button. | ||
704 | love | 708 | love |
705 | main menus | 709 | main menus |
706 | makeMainMenu() | 710 | makeMainMenu() |
@@ -710,8 +714,9 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
710 | elm_toolbar_item_append() | 714 | elm_toolbar_item_append() |
711 | elm_menu_item_add() | 715 | elm_menu_item_add() |
712 | makeMainMenuFinish() | 716 | makeMainMenuFinish() |
713 | ? elm_layout_box_append(win->win, WF_BOX, tb); | 717 | elm_object_part_content_set(win->layout, WF_TOOLBAR, tb); |
714 | 718 | isToolbar signal sent to layout. | |
719 | elm_toolbar_item_append() | ||
715 | 720 | ||
716 | 721 | ||
717 | Internal windows are - | 722 | Internal windows are - |
@@ -721,39 +726,25 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
721 | ELM_LAYOUT_CLASS WF_LAYOUT | 726 | ELM_LAYOUT_CLASS WF_LAYOUT |
722 | This layout becomes our window object. | 727 | This layout becomes our window object. |
723 | winFang.edc | 728 | winFang.edc |
724 | IMAGE background - semi transparent dark purple image. | 729 | ELM_BG_CLASS Internal window background, swallowed by WF_BACKGROUND. |
725 | SWALLOW underlay | 730 | Semi transparent dark purple image. |
726 | SWALLOW title | 731 | ELM_BOX_CLASS Swallowed by WF_BOX |
727 | Details change if it's internal. | ||
728 | BOX box | ||
729 | Details change if it's internal. | ||
730 | SWALLOW content | ||
731 | "isInternal" signal sent. | ||
732 | EVAS_RECTANGLE_CLASS Invisible click catcher, for moving windows. | 732 | EVAS_RECTANGLE_CLASS Invisible click catcher, for moving windows. |
733 | WF_UNDERLAY | 733 | Swallowed by WF_UNDERLAY |
734 | EVAS_IMAGE_CLASS Corner "handles" x 4. | 734 | EVAS_IMAGE_CLASS Corner "handles" x 4. |
735 | ELM_LABEL_CLASS Window title. | 735 | ELM_LABEL_CLASS Window title. |
736 | ELM_GRID_CLASS WF_SWALLOW | 736 | Swallowed by WF_TITLE |
737 | 737 | ELM_GRID_CLASS Swallowed by WF_GRID | |
738 | */ | ||
739 | 738 | ||
739 | widgetAdd Will either append it to WF_BOX, or pack it into WF_GRID using supplied coords and size. | ||
740 | Used by skang for creating widgets. | ||
741 | Used by purkle for it's main widgets (in C), in WF_BOX. | ||
742 | ? Used by files for WT_FILES, but not the rest, this ends up inside WF_BOX, though it has it's own vbox. | ||
743 | ?? This vbox is an ELM_BOX_CLASS, er but - | ||
744 | ??? elm_obj_box_horizontal_set(EINA_TRUE) | ||
745 | TODO - what happens when we mix BOX and GRID widgets? Perhaps GRID should live inside BOX? | ||
740 | 746 | ||
741 | // Create the background image | 747 | */ |
742 | #if 1 | ||
743 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); | ||
744 | ourGlobals.mainWindow->bg = eo_add(ELM_BG_CLASS, ourGlobals.mainWindow->win, | ||
745 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | ||
746 | efl_file_set(buf, NULL), | ||
747 | efl_gfx_visible_set(EINA_TRUE) | ||
748 | ); | ||
749 | elm_win_resize_object_add(ourGlobals.mainWindow->win, ourGlobals.mainWindow->bg); | ||
750 | #else | ||
751 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); | ||
752 | eo_do(ourGlobals.mainWindow->bg, | ||
753 | efl_file_set(buf, NULL), | ||
754 | efl_gfx_color_set(255, 255, 255, 255) | ||
755 | ); | ||
756 | #endif | ||
757 | 748 | ||
758 | init_evas_gl(&ourGlobals); | 749 | init_evas_gl(&ourGlobals); |
759 | 750 | ||