aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/extantz/extantz.c77
-rw-r--r--src/extantz/files.c12
-rw-r--r--src/extantz/woMan.c4
3 files changed, 37 insertions, 56 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)
588EAPI_MAIN int elm_main(int argc, char **argv) 586EAPI_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
diff --git a/src/extantz/files.c b/src/extantz/files.c
index a2d26df..c27cd9c 100644
--- a/src/extantz/files.c
+++ b/src/extantz/files.c
@@ -197,7 +197,6 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
197 ); 197 );
198 elm_object_text_set(hoversel, "sorting"); 198 elm_object_text_set(hoversel, "sorting");
199 elm_box_pack_end(vbox, hoversel); 199 elm_box_pack_end(vbox, hoversel);
200// eo_unref(hoversel);
201 200
202 hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, 201 hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox,
203 elm_obj_hoversel_hover_parent_set(me->win), 202 elm_obj_hoversel_hover_parent_set(me->win),
@@ -212,7 +211,6 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
212 elm_box_pack_end(vbox, hoversel); 211 elm_box_pack_end(vbox, hoversel);
213 // Make sure it starts off as small, works around "hitting grid mode before hitting size not showing anything" bug. 212 // Make sure it starts off as small, works around "hitting grid mode before hitting size not showing anything" bug.
214 _small_icon_clicked(fs, hoversel, NULL); 213 _small_icon_clicked(fs, hoversel, NULL);
215// eo_unref(hoversel);
216 214
217 215
218 bt = eo_add(ELM_CHECK_CLASS, vbox, 216 bt = eo_add(ELM_CHECK_CLASS, vbox,
@@ -222,7 +220,6 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
222 elm_object_text_set(bt, "hidden"); 220 elm_object_text_set(bt, "hidden");
223 evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs); 221 evas_object_smart_callback_add(bt, "changed", _hidden_clicked, fs);
224 elm_box_pack_end(vbox, bt); 222 elm_box_pack_end(vbox, bt);
225// eo_unref(bt);
226 223
227 rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, 224 rdg = rd = eo_add(ELM_RADIO_CLASS, vbox,
228 elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), 225 elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID),
@@ -233,7 +230,6 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
233 evas_object_smart_callback_add(rd, "changed", _mode_changed_cb, fs); 230 evas_object_smart_callback_add(rd, "changed", _mode_changed_cb, fs);
234 // Make it start in grid mode. It defaults to list mode, so this swaps it over. 231 // Make it start in grid mode. It defaults to list mode, so this swaps it over.
235 _mode_changed_cb(fs, rd, NULL); 232 _mode_changed_cb(fs, rd, NULL);
236// eo_unref(rd);
237 233
238 rd = eo_add(ELM_RADIO_CLASS, vbox, 234 rd = eo_add(ELM_RADIO_CLASS, vbox,
239 elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST), 235 elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST),
@@ -243,9 +239,6 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
243 elm_object_text_set(rd, "list"); 239 elm_object_text_set(rd, "list");
244 elm_box_pack_end(vbox, rd); 240 elm_box_pack_end(vbox, rd);
245 evas_object_smart_callback_add(rd, "changed", _mode_changed_cb, fs); 241 evas_object_smart_callback_add(rd, "changed", _mode_changed_cb, fs);
246// eo_unref(rd);
247 // No need to unref this, it's taken care of already.
248 //eo_unref(rdg);
249 242
250 bt = eo_add(ELM_BUTTON_CLASS, me->win, 243 bt = eo_add(ELM_BUTTON_CLASS, me->win,
251 efl_gfx_visible_set(EINA_TRUE) 244 efl_gfx_visible_set(EINA_TRUE)
@@ -253,7 +246,6 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
253 elm_object_text_set(bt, "OK"); 246 elm_object_text_set(bt, "OK");
254 evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me); 247 evas_object_smart_callback_add(bt, "clicked", _OK_clicked, me);
255 elm_box_pack_end(vbox, bt); 248 elm_box_pack_end(vbox, bt);
256// eo_unref(bt);
257 249
258 bt = eo_add(ELM_BUTTON_CLASS, me->win, 250 bt = eo_add(ELM_BUTTON_CLASS, me->win,
259 efl_gfx_visible_set(EINA_TRUE) 251 efl_gfx_visible_set(EINA_TRUE)
@@ -261,11 +253,9 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
261 elm_object_text_set(bt, "CANCEL"); 253 elm_object_text_set(bt, "CANCEL");
262 evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me); 254 evas_object_smart_callback_add(bt, "clicked", _CANCEL_clicked, me);
263 elm_box_pack_end(vbox, bt); 255 elm_box_pack_end(vbox, bt);
264// eo_unref(bt);
265 256
266 elm_layout_box_append(me->win, WF_BOX, vbox); 257 elm_box_pack_end(me->box, vbox);
267 evas_object_show(vbox); 258 evas_object_show(vbox);
268// eo_unref(vbox);
269 winFangCalcMinSize(me); 259 winFangCalcMinSize(me);
270 260
271 winFangHide(me); 261 winFangHide(me);
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index c867241..7ff1c28 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -254,7 +254,7 @@ winFang *woMan_add(globals *ourGlobals)
254 // TODO - This strdup leaks, but this is just temporary test code anyway, it will go away. 254 // TODO - This strdup leaks, but this is just temporary test code anyway, it will go away.
255 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, NoIcon, "Landmarks", _promote, tab_it); 255 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, NoIcon, "Landmarks", _promote, tab_it);
256 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, NoIcon, "Grids", _promote, tab_it); 256 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, NoIcon, "Grids", _promote, tab_it);
257 elm_layout_box_append(me->win, WF_BOX, nf); 257 elm_box_pack_end(me->box, nf);
258 258
259 bt = eo_add(ELM_BUTTON_CLASS, me->win, 259 bt = eo_add(ELM_BUTTON_CLASS, me->win,
260// evas_obj_text_set("Login"), 260// evas_obj_text_set("Login"),
@@ -264,7 +264,7 @@ winFang *woMan_add(globals *ourGlobals)
264 ); 264 );
265 elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. 265 elm_object_text_set(bt, "Login"); // No eo interface for this that I can find.
266// evas_object_smart_callback_add(bt, "clicked", NULL, NULL); 266// evas_object_smart_callback_add(bt, "clicked", NULL, NULL);
267 elm_layout_box_append(me->win, WF_BOX, bt); 267 elm_box_pack_end(me->box, bt);
268 268
269 winFangCalcMinSize(me); 269 winFangCalcMinSize(me);
270 270