From e77157ca1b62d6e282bfdf17a7f4eb44d9a5ba86 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 21 Jan 2016 20:29:45 +1000 Subject: Random cleanups. --- src/extantz/extantz.c | 12 +++++------- src/extantz/files.c | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 23 deletions(-) (limited to 'src/extantz') diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 7fc2d81..f55fa16 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -687,7 +687,6 @@ EAPI_MAIN int elm_main(int argc, char **argv) Eventually uses WF_GRID for widget layout, though could in future use WF_BOX for some of them. files.c winFang A normally hidden window with a file requestor, and other Elm widgets. -? elm_layout_box_append(me->win, WF_BOX, vbox); scenriAdd() 3D scene and node stuff ELM_IMAGE_CLASS Evas_3D render target. @@ -703,18 +702,17 @@ EAPI_MAIN int elm_main(int argc, char **argv) winFang World manager internal window, with it's own menu and toolbar stuff. Uses the same menu code as the main menus below. But with added pager stuff. - elm_layout_box_append(me->win, WF_BOX, nf); Elm naviframe for the tab pages. - elm_layout_box_append(me->win, WF_BOX, bt); Elm Login button. love main menus makeMainMenu() ELM_TOOLBAR_CLASS Holder toolbar. + Swallowed by WF_TOOLBAR menuAdd() ? various calls to various object creation functions, TODO - which maybe I can replace with EO stuff? elm_toolbar_item_append() elm_menu_item_add() makeMainMenuFinish() - elm_object_part_content_set(win->layout, WF_TOOLBAR, tb); + The swallow. isToolbar signal sent to layout. elm_toolbar_item_append() @@ -739,9 +737,9 @@ EAPI_MAIN int elm_main(int argc, char **argv) widgetAdd Will either append it to WF_BOX, or pack it into WF_GRID using supplied coords and size. Used by skang for creating widgets. Used by purkle for it's main widgets (in C), in WF_BOX. -? Used by files for WT_FILES, but not the rest, this ends up inside WF_BOX, though it has it's own vbox. -?? This vbox is an ELM_BOX_CLASS, er but - -??? elm_obj_box_horizontal_set(EINA_TRUE) + Used by woMan for it's main widgets (in C), in WF_BOX. + Used by files for WT_FILES, but not the rest, this ends up inside WF_BOX, along with a hbox at the end. + Used by LSLGuiMess for the widgets (in Lua) in WF_GRID. TODO - what happens when we mix BOX and GRID widgets? Perhaps GRID should live inside BOX? */ diff --git a/src/extantz/files.c b/src/extantz/files.c index c27cd9c..535e250 100644 --- a/src/extantz/files.c +++ b/src/extantz/files.c @@ -144,7 +144,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa { winFang *me = NULL; Widget *wid; - Evas_Object *vbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel; + Evas_Object *hbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel; me = winFangAdd(ourGlobals->mainWindow, 10, 500, 300, 500, "file selector", "files", ourGlobals->world); @@ -176,13 +176,13 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa // Call back for double click or Enter pressed on file. evas_object_smart_callback_add(fs, "activated", my_fileselector_activated, me); - vbox = eo_add(ELM_BOX_CLASS, me->win, + hbox = eo_add(ELM_BOX_CLASS, me->win, elm_obj_box_homogeneous_set(EINA_FALSE), elm_obj_box_horizontal_set(EINA_TRUE), evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL) ); - hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, + hoversel = eo_add(ELM_HOVERSEL_CLASS, hbox, elm_obj_hoversel_hover_parent_set(me->win), eo_key_data_set("fileselector", fs), elm_obj_hoversel_item_add("name(asc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_FILENAME_ASC), @@ -196,9 +196,9 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa efl_gfx_visible_set(EINA_TRUE) ); elm_object_text_set(hoversel, "sorting"); - elm_box_pack_end(vbox, hoversel); + elm_box_pack_end(hbox, hoversel); - hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, + hoversel = eo_add(ELM_HOVERSEL_CLASS, hbox, elm_obj_hoversel_hover_parent_set(me->win), eo_key_data_set("fileselector", fs), elm_obj_hoversel_item_add("tiny", NULL, ELM_ICON_NONE, _tiny_icon_clicked, fs), @@ -208,36 +208,36 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa efl_gfx_visible_set(EINA_TRUE) ); elm_object_text_set(hoversel, "size"); - elm_box_pack_end(vbox, hoversel); + elm_box_pack_end(hbox, hoversel); // Make sure it starts off as small, works around "hitting grid mode before hitting size not showing anything" bug. _small_icon_clicked(fs, hoversel, NULL); - bt = eo_add(ELM_CHECK_CLASS, vbox, + bt = eo_add(ELM_CHECK_CLASS, hbox, elm_obj_check_state_set(elm_fileselector_hidden_visible_get(fs)), efl_gfx_visible_set(EINA_TRUE) ); elm_object_text_set(bt, "hidden"); evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs); - elm_box_pack_end(vbox, bt); + elm_box_pack_end(hbox, bt); - rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, + rdg = rd = eo_add(ELM_RADIO_CLASS, hbox, elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), efl_gfx_visible_set(EINA_TRUE) ); elm_object_text_set(rd, "grid"); - elm_box_pack_end(vbox, rd); + elm_box_pack_end(hbox, rd); evas_object_smart_callback_add(rd, "changed", _mode_changed_cb, fs); // Make it start in grid mode. It defaults to list mode, so this swaps it over. _mode_changed_cb(fs, rd, NULL); - rd = eo_add(ELM_RADIO_CLASS, vbox, + rd = eo_add(ELM_RADIO_CLASS, hbox, elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST), efl_gfx_visible_set(EINA_TRUE) ); elm_radio_group_add(rd, rdg); elm_object_text_set(rd, "list"); - elm_box_pack_end(vbox, rd); + elm_box_pack_end(hbox, rd); evas_object_smart_callback_add(rd, "changed", _mode_changed_cb, fs); bt = eo_add(ELM_BUTTON_CLASS, me->win, @@ -245,17 +245,17 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa ); elm_object_text_set(bt, "OK"); evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me); - elm_box_pack_end(vbox, bt); + elm_box_pack_end(hbox, bt); bt = eo_add(ELM_BUTTON_CLASS, me->win, efl_gfx_visible_set(EINA_TRUE) ); elm_object_text_set(bt, "CANCEL"); evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me); - elm_box_pack_end(vbox, bt); + elm_box_pack_end(hbox, bt); - elm_box_pack_end(me->box, vbox); - evas_object_show(vbox); + elm_box_pack_end(me->box, hbox); + evas_object_show(hbox); winFangCalcMinSize(me); winFangHide(me); -- cgit v1.1