From: <enl...@li...> - 2005-10-31 15:49:40
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Disable esmart_textarea for now, mention that it needs to be fixed and re enabled. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/TODO,v retrieving revision 1.282 retrieving revision 1.283 diff -u -3 -r1.282 -r1.283 --- TODO 30 Oct 2005 11:05:57 -0000 1.282 +++ TODO 31 Oct 2005 15:49:31 -0000 1.283 @@ -25,6 +25,14 @@ * BUG: if you have 2 zones and you fill up zone 2 (right) mostly and then run a big xev (xev -g 1280x1024) that wont fit it gets placed offscreen to the right of zone 2 +* FIX: Esmart_textarea has been disabled until it is updated to the new + textblock API. Affected files are - + e17/libs/esmart/configure.in + e17/libs/esmart/src/lib/Makefile.am + e17/apps/e_modules/src/modules/Makefile.am + e17/apps/e_modules/src/modules/notes/Makefile.am + e17/apps/e_utils/src/bin/exige/Makefile.am + e17/apps/eclair/src/eclair_subtitles.c ]]] [[[ |
From: <enl...@li...> - 2005-12-13 04:28:34
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c Log Message: Fix follower orientation confusion bug. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -3 -r1.88 -r1.89 --- e_mod_main.c 4 Dec 2005 12:03:59 -0000 1.88 +++ e_mod_main.c 13 Dec 2005 04:28:26 -0000 1.89 @@ -1839,6 +1839,10 @@ evas_object_layer_set(o, 2); e_theme_edje_object_set(o, "base/theme/modules/ibar", "modules/ibar/follower"); + + edje_object_signal_emit(o, "set_orientation", _ibar_main_orientation[e_gadman_client_edge_get(ibb->gmc)]); + edje_object_message_signal_process(o); + evas_object_show(o); } } |
From: <enl...@li...> - 2005-12-13 04:47:48
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.h e_mod_main.c Makefile.am Added Files: e_mod_config.h e_mod_config.c Log Message: Convert to using a config dialog instead of config menu. Courtesy of devilhorns. This is the patch he posted to the mailing list two days ago. Committed after much testing and some discussion with variosu parties. In particular, it got a thourough thrashing while we tracked down the follower confusion bug, as that required constant config changes using the new dialog. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_mod_main.h 5 Oct 2005 17:56:35 -0000 1.23 +++ e_mod_main.h 13 Dec 2005 04:47:41 -0000 1.24 @@ -97,4 +97,8 @@ EAPI int e_modapi_info (E_Module *m); EAPI int e_modapi_about (E_Module *m); +EAPI void _ibar_bar_cb_config_updated(void *data); +//EAPI void _ibar_bar_cb_width_auto(void *data); +//EAPI void _ibar_bar_cb_iconsize_change(void *data); + #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- e_mod_main.c 13 Dec 2005 04:28:26 -0000 1.89 +++ e_mod_main.c 13 Dec 2005 04:47:41 -0000 1.90 @@ -3,6 +3,7 @@ */ #include "e.h" #include "e_mod_main.h" +#include "e_mod_config.h" /* TODO List: * @@ -83,35 +84,26 @@ static void _ibar_icon_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_icon_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _ibar_bar_cb_width_auto(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_follower(void *data, E_Menu *m, E_Menu_Item *mi); #if 0 static void _ibar_icon_reorder_before(IBar_Icon *ic, IBar_Icon *before); #endif -static void _ibar_bar_iconsize_change(IBar_Bar *ibb); -static void _ibar_bar_cb_iconsize_microscopic(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_tiny(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_very_small(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_small(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_medium(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_large(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_very_large(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_extremely_large(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_huge(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_enormous(void *data, E_Menu *m, E_Menu_Item *mi); -static void _ibar_bar_cb_iconsize_gigantic(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_bar_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_bar_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); - +static void _ibar_bar_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_drag_cb_intercept_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y); static void _ibar_drag_cb_intercept_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h); +/* Config Updated Function Protos */ +static void _ibar_bar_cb_width_auto(void *data); +static void _ibar_bar_cb_follower(void *data); +static void _ibar_bar_cb_iconsize_change(void *data); + /* public module routines. all modules must have these */ -E_Module_Api e_modapi = +E_Module_Api e_modapi = { E_MODULE_API_VERSION, - "IBar" + "IBar" }; void * @@ -162,7 +154,7 @@ int e_modapi_about(E_Module *m) { - e_module_dialog_show(_("Enlightenment IBar Module"), + e_module_dialog_show(_("Enlightenment IBar Module"), _("This is the IBar Application Launcher bar module for Enlightenment.<br>" "It is a first example module and is being used to flesh out several<br>" "interfaces in Enlightenment 0.17.0. It is under heavy development,<br>" @@ -217,7 +209,7 @@ E_CONFIG_LIMIT(ib->conf->autoscroll_speed, 0.01, 1.0); E_CONFIG_LIMIT(ib->conf->iconsize, 2, 400); E_CONFIG_LIMIT(ib->conf->width, -2, -1); - + _ibar_config_menu_new(ib); if (ib->conf->appdir[0] != '/') @@ -270,14 +262,9 @@ /* Menu */ _ibar_bar_menu_new(ibb); - /* Add main menu to bar menu */ - mi = e_menu_item_new(ibb->menu); - e_menu_item_label_set(mi, _("Options")); - e_menu_item_submenu_set(mi, ib->config_menu_options); - - mi = e_menu_item_new(ibb->menu); - e_menu_item_label_set(mi, _("Size")); - e_menu_item_submenu_set(mi, ib->config_menu_size); + mi = e_menu_item_new(ib->config_menu); + e_menu_item_label_set(mi, _("Config Dialog")); + e_menu_item_callback_set(mi, _ibar_bar_cb_menu_configure, ibb); mi = e_menu_item_new(ib->config_menu); e_menu_item_label_set(mi, con->name); @@ -306,8 +293,6 @@ if (ib->conf->appdir) evas_stringshare_del(ib->conf->appdir); e_app_change_callback_del(_ibar_app_change, ib); - e_object_del(E_OBJECT(ib->config_menu_options)); - e_object_del(E_OBJECT(ib->config_menu_size)); e_object_del(E_OBJECT(ib->config_menu)); evas_list_free(ib->conf->bars); free(ib->conf); @@ -341,7 +326,7 @@ for (ll = ib->apps->subapps; ll; ll = ll->next) { E_App *a2; - + a2 = ll->data; ic = _ibar_icon_find(ibb, a2); if (ic) _ibar_icon_reorder_after(ic, NULL); @@ -403,7 +388,7 @@ if (e_app_is_parent(ib->apps, a)) { IBar_Icon *ic; - + ic = _ibar_icon_find(ibb, a); if (ic) { @@ -436,7 +421,7 @@ if (a->startup_notify) { IBar_Icon *ic; - + ic = _ibar_icon_find(ibb, a); if (ic) { @@ -613,7 +598,7 @@ ibb->drag_object = NULL; if (ibb->drag_object_overlay) evas_object_del(ibb->drag_object_overlay); ibb->drag_object_overlay = NULL; - + e_gadman_client_save(ibb->gmc); e_object_del(E_OBJECT(ibb->gmc)); @@ -641,7 +626,12 @@ if (ibb->conf->enabled) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _ibar_bar_cb_menu_enabled, ibb); */ - + + /* Config */ + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Config Dialog")); + e_menu_item_callback_set(mi, _ibar_bar_cb_menu_configure, ibb); + /* Edit */ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Edit Mode")); @@ -649,6 +639,17 @@ } static void +_ibar_bar_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi) +{ + IBar_Bar *ibb; + E_Config_Dialog *cfd; + + ibb = data; + if (!ibb) return; + e_int_config_ibar(ibb->con, ibb->ibar); +} + +static void _ibar_bar_enable(IBar_Bar *ibb) { ibb->conf->enabled = 1; @@ -674,7 +675,7 @@ _ibar_icon_new(IBar_Bar *ibb, E_App *a) { IBar_Icon *ic; -// char *str; + // char *str; Evas_Object *o; Evas_Coord w, h; @@ -823,114 +824,9 @@ _ibar_config_menu_new(IBar *ib) { E_Menu *mn; - E_Menu_Item *mi; mn = e_menu_new(); ib->config_menu = mn; - - mn = e_menu_new(); - ib->config_menu_options = mn; - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Auto fit icons")); - e_menu_item_check_set(mi, 1); - if (ib->conf->width == IBAR_WIDTH_AUTO) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_width_auto, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Follower")); - e_menu_item_check_set(mi, 1); - if (ib->conf->follower) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_follower, ib); - - mn = e_menu_new(); - ib->config_menu_size = mn; - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Microscopic")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 8) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_microscopic, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Tiny")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 12) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_tiny, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Very Small")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 16) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_very_small, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Small")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 24) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_small, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Medium")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 32) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_medium, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Large")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 40) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_large, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Very Large")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 48) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_very_large, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Extremely Large")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 56) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_extremely_large, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Huge")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 64) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_huge, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Enormous")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 96) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_enormous, ib); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Gigantic")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (ib->conf->iconsize == 128) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_gigantic, ib); - - /* Submenus */ - mi = e_menu_item_new(ib->config_menu); - e_menu_item_label_set(mi, _("Options")); - e_menu_item_submenu_set(mi, ib->config_menu_options); - - mi = e_menu_item_new(ib->config_menu); - e_menu_item_label_set(mi, _("Size")); - e_menu_item_submenu_set(mi, ib->config_menu_size); } #if 0 @@ -1309,8 +1205,8 @@ { drag_x = ev->output.x; drag_y = ev->output.y; - drag_start = 1; - drag = 0; + drag_start = 1; + drag = 0; } } @@ -1345,7 +1241,7 @@ dx = ev->cur.output.x - drag_x; dy = ev->cur.output.y - drag_y; - if (((dx * dx) + (dy * dy)) > + if (((dx * dx) + (dy * dy)) > (e_config->drag_resist * e_config->drag_resist)) { E_Drag *d; @@ -1688,7 +1584,7 @@ "does not have a matching application file.<br>" "<br>" "The icon cannot be added to IBar." - )); + )); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); e_dialog_button_focus_num(dia, 1); e_win_centered_set(dia->win, 1); @@ -1750,73 +1646,65 @@ switch (change) { case E_GADMAN_CHANGE_MOVE_RESIZE: - e_gadman_client_geometry_get(ibb->gmc, &ibb->x, &ibb->y, &ibb->w, &ibb->h); + e_gadman_client_geometry_get(ibb->gmc, &ibb->x, &ibb->y, &ibb->w, &ibb->h); + + edje_extern_object_min_size_set(ibb->box_object, 0, 0); + edje_object_part_swallow(ibb->bar_object, "items", ibb->box_object); + + evas_object_move(ibb->bar_object, ibb->x, ibb->y); + if (ibb->overlay_object) + evas_object_move(ibb->overlay_object, ibb->x, ibb->y); + evas_object_resize(ibb->bar_object, ibb->w, ibb->h); + if (ibb->overlay_object) + evas_object_resize(ibb->overlay_object, ibb->w, ibb->h); - edje_extern_object_min_size_set(ibb->box_object, 0, 0); - edje_object_part_swallow(ibb->bar_object, "items", ibb->box_object); + _ibar_bar_follower_reset(ibb); + _ibar_bar_timer_handle(ibb); - evas_object_move(ibb->bar_object, ibb->x, ibb->y); - if (ibb->overlay_object) - evas_object_move(ibb->overlay_object, ibb->x, ibb->y); - evas_object_resize(ibb->bar_object, ibb->w, ibb->h); - if (ibb->overlay_object) - evas_object_resize(ibb->overlay_object, ibb->w, ibb->h); - - _ibar_bar_follower_reset(ibb); - _ibar_bar_timer_handle(ibb); - - e_drop_handler_geometry_set(ibb->drop_handler, - ibb->x + ibb->bar_inset.l, ibb->y + ibb->bar_inset.t, - ibb->w - (ibb->bar_inset.l + ibb->bar_inset.r), - ibb->h - (ibb->bar_inset.t + ibb->bar_inset.b)); - break; + e_drop_handler_geometry_set(ibb->drop_handler, + ibb->x + ibb->bar_inset.l, ibb->y + ibb->bar_inset.t, + ibb->w - (ibb->bar_inset.l + ibb->bar_inset.r), + ibb->h - (ibb->bar_inset.t + ibb->bar_inset.b)); + break; case E_GADMAN_CHANGE_EDGE: - _ibar_bar_edge_change(ibb, e_gadman_client_edge_get(ibb->gmc)); - break; + _ibar_bar_edge_change(ibb, e_gadman_client_edge_get(ibb->gmc)); + break; case E_GADMAN_CHANGE_RAISE: case E_GADMAN_CHANGE_ZONE: /* FIXME * Must we do something here? */ - break; + break; } } +void +_ibar_bar_cb_config_updated(void *data) +{ + /* Call Any Needed Funcs To Let Module Handle Config Changes */ + _ibar_bar_cb_follower(data); + _ibar_bar_cb_width_auto(data); + _ibar_bar_cb_iconsize_change(data); +} + static void -_ibar_bar_cb_width_auto(void *data, E_Menu *m, E_Menu_Item *mi) +_ibar_bar_cb_width_auto(void *data) { IBar *ib; IBar_Bar *ibb; - unsigned char enabled; Evas_List *l; ib = data; - enabled = e_menu_item_toggle_get(mi); - if ((enabled) && (ib->conf->width == IBAR_WIDTH_FIXED)) - { - ib->conf->width = IBAR_WIDTH_AUTO; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - _ibar_bar_update_policy(ibb); - _ibar_bar_frame_resize(ibb); - } - } - else if (!(enabled) && (ib->conf->width == IBAR_WIDTH_AUTO)) + for (l = ib->bars; l; l = l->next) { - ib->conf->width = IBAR_WIDTH_FIXED; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - _ibar_bar_update_policy(ibb); - _ibar_bar_frame_resize(ibb); - } + ibb = l->data; + _ibar_bar_update_policy(ibb); + _ibar_bar_frame_resize(ibb); } - e_config_save_queue(); } static void -_ibar_bar_cb_follower(void *data, E_Menu *m, E_Menu_Item *mi) +_ibar_bar_cb_follower(void *data) { IBar *ib; IBar_Bar *ibb; @@ -1824,10 +1712,9 @@ Evas_List *l; ib = data; - enabled = e_menu_item_toggle_get(mi); - if ((enabled) && (!ib->conf->follower)) + enabled = ib->conf->follower; + if (enabled) { - ib->conf->follower = 1; for (l = ib->bars; l; l = l->next) { Evas_Object *o; @@ -1846,9 +1733,8 @@ evas_object_show(o); } } - else if (!(enabled) && (ib->conf->follower)) + else if (!enabled) { - ib->conf->follower = 0; for (l = ib->bars; l; l = l->next) { ibb = l->data; @@ -1857,237 +1743,47 @@ ibb->overlay_object = NULL; } } - e_config_save_queue(); -} - -static void -_ibar_bar_iconsize_change(IBar_Bar *ibb) -{ - Evas_List *l; - - e_box_freeze(ibb->box_object); - for (l = ibb->icons; l; l = l->next) - { - IBar_Icon *ic; - Evas_Object *o; - Evas_Coord w, h; - - ic = l->data; - o = ic->icon_object; - - evas_object_resize(o, ibb->ibar->conf->iconsize, ibb->ibar->conf->iconsize); - edje_object_part_swallow(ic->bg_object, "item", o); - - w = ibb->ibar->conf->iconsize + ibb->icon_inset.l + ibb->icon_inset.r; - h = ibb->ibar->conf->iconsize + ibb->icon_inset.t + ibb->icon_inset.b; - e_box_pack_options_set(ic->bg_object, - 1, 1, /* fill */ - 0, 0, /* expand */ - 0.5, 0.5, /* align */ - w, h, /* min */ - w, h /* max */ - ); - } - e_box_thaw(ibb->box_object); - _ibar_bar_frame_resize(ibb); -} - -static void -_ibar_bar_cb_iconsize_microscopic(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 8; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); } static void -_ibar_bar_cb_iconsize_tiny(void *data, E_Menu *m, E_Menu_Item *mi) +_ibar_bar_cb_iconsize_change(void *data) { IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 12; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_very_small(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 16; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_small(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 24; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_medium(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 32; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_large(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 40; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_very_large(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 48; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_extremely_large(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; + Evas_List *l, *ll; ib = data; - ib->conf->iconsize = 56; for (l = ib->bars; l; l = l->next) { IBar_Bar *ibb; ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_huge(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 64; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} - -static void -_ibar_bar_cb_iconsize_enormous(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; - - ib = data; - ib->conf->iconsize = 96; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; - - ibb = l->data; - _ibar_bar_iconsize_change(ibb); - } - e_config_save_queue(); -} + e_box_freeze(ibb->box_object); + for (ll = ibb->icons; ll; ll = ll->next) + { + IBar_Icon *ic; + Evas_Object *o; + Evas_Coord w, h; -static void -_ibar_bar_cb_iconsize_gigantic(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar *ib; - Evas_List *l; + ic = ll->data; + o = ic->icon_object; - ib = data; - ib->conf->iconsize = 128; - for (l = ib->bars; l; l = l->next) - { - IBar_Bar *ibb; + evas_object_resize(o, ibb->ibar->conf->iconsize, ibb->ibar->conf->iconsize); + edje_object_part_swallow(ic->bg_object, "item", o); - ibb = l->data; - _ibar_bar_iconsize_change(ibb); + w = ibb->ibar->conf->iconsize + ibb->icon_inset.l + ibb->icon_inset.r; + h = ibb->ibar->conf->iconsize + ibb->icon_inset.t + ibb->icon_inset.b; + e_box_pack_options_set(ic->bg_object, + 1, 1, /* fill */ + 0, 0, /* expand */ + 0.5, 0.5, /* align */ + w, h, /* min */ + w, h /* max */ + ); + } + e_box_thaw(ibb->box_object); + _ibar_bar_frame_resize(ibb); } - e_config_save_queue(); } static void @@ -2099,11 +1795,11 @@ ibb = data; enabled = e_menu_item_toggle_get(mi); if ((ibb->conf->enabled) && (!enabled)) - { + { _ibar_bar_disable(ibb); } else if ((!ibb->conf->enabled) && (enabled)) - { + { _ibar_bar_enable(ibb); } } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 14 May 2005 14:06:09 -0000 1.6 +++ Makefile.am 13 Dec 2005 04:47:41 -0000 1.7 @@ -20,7 +20,9 @@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ - e_mod_main.h + e_mod_main.h \ + e_mod_config.c \ + e_mod_config.h module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h |
From: <enl...@li...> - 2006-01-13 06:39:25
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps.c e_intl.c e_thumb.c Log Message: Minor API breakage and fixage. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- e_apps.c 10 Jan 2006 08:46:33 -0000 1.111 +++ e_apps.c 13 Jan 2006 06:38:43 -0000 1.112 @@ -128,7 +128,7 @@ _e_apps_path_all = evas_stringshare_add(buf); free(home); _e_apps_repositories = evas_list_append(_e_apps_repositories, evas_stringshare_add(buf)); - _e_apps_exit_handler = ecore_event_handler_add(ECORE_EVENT_EXE_EXIT, _e_apps_cb_exit, NULL); + _e_apps_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_apps_cb_exit, NULL); _e_apps_border_add_handler = ecore_event_handler_add(E_EVENT_BORDER_ADD, _e_app_cb_event_border_add, NULL); _e_apps_all = e_app_new(buf, 1); return 1; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- e_intl.c 10 Jan 2006 04:23:43 -0000 1.69 +++ e_intl.c 13 Jan 2006 06:38:43 -0000 1.70 @@ -129,7 +129,7 @@ if ((e_config->input_method) && (e_config->input_method[0] != 0)) e_intl_input_method_set(e_config->input_method); - _e_intl_exit_handler = ecore_event_handler_add(ECORE_EVENT_EXE_EXIT, _e_intl_cb_exit, NULL); + _e_intl_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_intl_cb_exit, NULL); return 1; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_thumb.c 7 Jan 2006 13:21:35 -0000 1.21 +++ e_thumb.c 13 Jan 2006 06:38:43 -0000 1.22 @@ -50,7 +50,7 @@ event_handlers = evas_list_append(event_handlers, - ecore_event_handler_add(ECORE_EVENT_EXE_EXIT, + ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_thumb_cb_exe_exit, NULL)); return 1; |
From: <enl...@li...> - 2006-01-15 11:27:57
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps.c e_intl.c e_thumb.c Log Message: More ecore_exe naming break'n'fix. Should be all done now. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -3 -r1.114 -r1.115 --- e_apps.c 15 Jan 2006 10:44:18 -0000 1.114 +++ e_apps.c 15 Jan 2006 11:27:18 -0000 1.115 @@ -1841,7 +1841,7 @@ static int _e_apps_cb_exit(void *data, int type, void *event) { - Ecore_Event_Exe_Exit *ev; + Ecore_Exe_Event_Del *ev; E_App_Instance *ai; E_App *a; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- e_intl.c 13 Jan 2006 06:38:43 -0000 1.70 +++ e_intl.c 15 Jan 2006 11:27:18 -0000 1.71 @@ -451,7 +451,7 @@ static int _e_intl_cb_exit(void *data, int type, void *event) { - Ecore_Event_Exe_Exit *ev; + Ecore_Exe_Event_Del *ev; ev = event; if (!ev->exe) return 1; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_thumb.c 15 Jan 2006 07:11:02 -0000 1.23 +++ e_thumb.c 15 Jan 2006 11:27:18 -0000 1.24 @@ -567,7 +567,7 @@ static int _e_thumb_cb_exe_exit(void *data, int type, void *event) { - Ecore_Event_Exe_Exit *ev; + Ecore_Exe_Event_Del *ev; E_Thumb_Item *t; char *ext; |
From: <enl...@li...> - 2006-01-21 11:48:43
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config_dialog.c Log Message: Make it a bit more generic. * Allow NULL apply_cfdata functions. * Autohide the "Apply" and "OK" buttons if there is no apply_cfdata functions. * Change the mode switch button text to be more generic. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_config_dialog.c 17 Jan 2006 20:25:48 -0000 1.16 +++ e_config_dialog.c 21 Jan 2006 11:48:30 -0000 1.17 @@ -32,10 +32,13 @@ cfd->icon_size = icon_size; } cfd->data = data; - cfd->hide_buttons = 0; - + cfd->hide_buttons = 1; + + if ((cfd->view.basic.apply_cfdata) || (cfd->view.advanced.apply_cfdata)) + cfd->hide_buttons = 0; + _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC); - + return cfd; } @@ -85,7 +88,7 @@ ob = cfd->view.basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), - _("Advanced Settings"), "widget/new_dialog", + _("Advanced"), "widget/new_dialog", _e_config_dialog_cb_advanced, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } @@ -100,7 +103,7 @@ ob = cfd->view.advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), - _("Basic Settings"), "widget/new_dialog", + _("Basic"), "widget/new_dialog", _e_config_dialog_cb_basic, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } @@ -170,9 +173,15 @@ cfd = dia->data; if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) - ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata); + { + if (cfd->view.basic.apply_cfdata) + ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata); + } else - ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata); + { + if (cfd->view.advanced.apply_cfdata) + ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata); + } if (ok) e_object_del(E_OBJECT(cfd)); } @@ -184,10 +193,16 @@ cfd = dia->data; if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) - ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata); + { + if (cfd->view.basic.apply_cfdata) + ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata); + } else - ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata); - if (ok) + { + if (cfd->view.advanced.apply_cfdata) + ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata); + } + if ((ok) && (!cfd->hide_buttons)) { e_dialog_button_disable_num_set(cfd->dia, 0, 1); e_dialog_button_disable_num_set(cfd->dia, 1, 1); @@ -218,6 +233,9 @@ E_Config_Dialog *cfd; cfd = data; - e_dialog_button_disable_num_set(cfd->dia, 0, 0); - e_dialog_button_disable_num_set(cfd->dia, 1, 0); + if (!cfd->hide_buttons) + { + e_dialog_button_disable_num_set(cfd->dia, 0, 0); + e_dialog_button_disable_num_set(cfd->dia, 1, 0); + } } |
From: <enl...@li...> - 2006-01-21 12:44:54
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config_dialog.c e_config_dialog.h Log Message: Add a close button callback hook at the request of devilhorns. If the callback returns zero, the dialog is NOT closed. Seems that every user of config_dialog allocates E_Config_Dialog_View on the stack and doesn't clear it, so I can't rely on the close_cfdata member being NULL. I currently set it to NULL in e_config_dialog_new() and if you want to use it, set it in create_widgets(); I suspect that allocating a structure on the stack that lives beyond the function call is just asking for trouble. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_config_dialog.c 21 Jan 2006 11:48:30 -0000 1.17 +++ e_config_dialog.c 21 Jan 2006 12:44:48 -0000 1.18 @@ -12,6 +12,7 @@ static void _e_config_dialog_cb_advanced(void *data, void *data2); static void _e_config_dialog_cb_basic(void *data, void *data2); static void _e_config_dialog_cb_changed(void *data, Evas_Object *obj); +static void _e_config_dialog_cb_close(void *data, E_Dialog *dia); /* local subsystem globals */ @@ -22,8 +23,16 @@ { E_Config_Dialog *cfd; + cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, _e_config_dialog_free); cfd->view = *view; + /* Seems that every user of this allocates view it on the stack and doesn't clear it, + * so I can't rely on this being NULL. I currently set it to NULL in e_config_dialog_new() + * and if you want to use it, set it in create_widgets(); + * I suspect that allocating a structure on the stack that lives beyond the function + * call is just asking for trouble. + */ + cfd->view.close_cfdata = NULL; cfd->con = con; cfd->title = evas_stringshare_add(title); if (icon) @@ -122,7 +131,7 @@ e_dialog_button_disable_num_set(cfd->dia, 0, 1); e_dialog_button_disable_num_set(cfd->dia, 1, 1); } - e_dialog_button_add(cfd->dia, _("Close"), NULL, NULL, NULL); + e_dialog_button_add(cfd->dia, _("Close"), NULL, _e_config_dialog_cb_close, cfd); if (!pdia) { e_win_centered_set(cfd->dia->win, 1); @@ -239,3 +248,17 @@ e_dialog_button_disable_num_set(cfd->dia, 1, 0); } } + +static void +_e_config_dialog_cb_close(void *data, E_Dialog *dia) +{ + E_Config_Dialog *cfd; + int ok = 1; + + cfd = dia->data; + if (cfd->view.close_cfdata) + ok = cfd->view.close_cfdata(cfd, cfd->cfdata); + + if (ok) + e_object_del(E_OBJECT(dia)); +} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_config_dialog.h 14 Jan 2006 16:05:35 -0000 1.6 +++ e_config_dialog.h 21 Jan 2006 12:44:48 -0000 1.7 @@ -23,6 +23,11 @@ { void *(*create_cfdata) (E_Config_Dialog *cfd); void (*free_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + /* Seems that every user of this structure allocates it on the stack and doesn't clear it, + * so I can't rely on this being NULL. I currently set it to NULL in e_config_dialog_new() + * and if you want to use it, set it in create_widgets(); + */ + int (*close_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); struct { int (*apply_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); Evas_Object *(*create_widgets) (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); |
From: <enl...@li...> - 2006-01-21 15:39:16
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_apps.c e_apps.h Added Files: e_apps_error.c Log Message: Exe error dialog. Still needs some work, but it's good enough for testing by the wider community. Currently only e_app started exe's get this. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- Makefile.am 12 Jan 2006 02:12:21 -0000 1.94 +++ Makefile.am 21 Jan 2006 15:39:03 -0000 1.95 @@ -208,6 +208,7 @@ e_widget_entry.c \ e_widget_image.c \ e_config_dialog.c \ +e_apps_error.c \ e_int_config_focus.c \ e_icon_grid.c \ e_icon_canvas.c \ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -3 -r1.116 -r1.117 --- e_apps.c 17 Jan 2006 10:50:58 -0000 1.116 +++ e_apps.c 21 Jan 2006 15:39:03 -0000 1.117 @@ -13,6 +13,9 @@ * - clean up the add app functions. To much similar code. */ +extern void _e_app_error_dialog(E_Container *con, E_App_Autopsy *app); + + /* local subsystem functions */ typedef struct _E_App_Change_Info E_App_Change_Info; typedef struct _E_App_Callback E_App_Callback; @@ -417,7 +420,8 @@ * the eapp file */ inst = E_NEW(E_App_Instance, 1); if (!inst) return 0; - exe = ecore_exe_run(a->exe, inst); + /* We want the stdout and stderr as lines for the error dialog if it exits abnormally. */ + exe = ecore_exe_pipe_run(a->exe, ECORE_EXE_PIPE_AUTO| ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR | ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED, inst); if (!exe) { free(inst); @@ -429,6 +433,8 @@ a->exe); return 0; } + /* 20 lines at start and end, 20x100 limit on bytes at each end. */ + ecore_exe_auto_limits_set(exe, 2000, 2000, 20, 20); ecore_exe_tag_set(exe, "E/app"); inst->app = a; inst->exe = exe; @@ -1854,13 +1860,25 @@ a = ai->app; if (!a) return 1; - /* FIXME: maybe we could capture stdout/stderr and display it here? */ - if (ev->exit_code == 127) /* /bin/sh uses this if cmd not found */ - e_error_dialog_show(_("Run Error"), - _("Enlightenment was unable to run the program:\n" - "\n" - "%s\n"), - a->exe); + if ( (ev->exited) && (ev->exit_code == 127) ) /* /bin/sh uses this if cmd not found */ + { + e_error_dialog_show(_("Run Error"), + _("Enlightenment was unable to run the program:\n" + "\n" + "%s\n"), + a->exe); + } + else if ( ! ((ev->exited) && (ev->exit_code == EXIT_SUCCESS)) ) /* Let's hope that everyhing returns this properly. */ + { /* Show the error dialog with details from the exe. */ + E_App_Autopsy *aut; + + aut = E_NEW(E_App_Autopsy, 1); + aut->app = a; + aut->del = *ev; + aut->read = ecore_exe_event_data_get(ai->exe, ECORE_FD_READ); + aut->error = ecore_exe_event_data_get(ai->exe, ECORE_FD_ERROR); + _e_app_error_dialog(NULL, aut); + } if (ai->expire_timer) ecore_timer_del(ai->expire_timer); free(ai); a->instances = evas_list_remove(a->instances, ai); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_apps.h 14 Jan 2006 21:05:43 -0000 1.27 +++ e_apps.h 21 Jan 2006 15:39:03 -0000 1.28 @@ -17,6 +17,7 @@ typedef struct _E_App E_App; typedef struct _E_App_Instance E_App_Instance; +typedef struct _E_App_Autopsy E_App_Autopsy; #else #ifndef E_APPS_H @@ -76,6 +77,15 @@ Ecore_Timer *expire_timer; }; +struct _E_App_Autopsy +{ + E_App *app; + + Ecore_Exe_Event_Del del; + E_Config_Dialog *error_dialog; + Ecore_Exe_Event_Data *error, *read; +}; + EAPI int e_app_init (void); EAPI int e_app_shutdown (void); |
From: <enl...@li...> - 2006-01-21 17:35:42
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps_error.c Log Message: A little birthday present I got from devilhorns. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_apps_error.c 21 Jan 2006 15:39:03 -0000 1.1 +++ e_apps_error.c 21 Jan 2006 17:35:36 -0000 1.2 @@ -33,7 +33,7 @@ v.advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("Run error"), NULL, 0, &v, app); + cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, &v, app); app->error_dialog = cfd; } |
From: <enl...@li...> - 2006-01-21 18:15:33
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps_error.c Log Message: Typo. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_apps_error.c 21 Jan 2006 17:35:36 -0000 1.2 +++ e_apps_error.c 21 Jan 2006 18:15:23 -0000 1.3 @@ -55,7 +55,7 @@ { cfdata->exit = malloc((length + 64) * sizeof(char)); if (cfdata->exit) - sprintf(cfdata->exit, "An exit code of %i was return from %s", app->del.exit_code, app->app->exe); + sprintf(cfdata->exit, "An exit code of %i was returned from %s", app->del.exit_code, app->app->exe); } if ((app->del.signalled) && (!cfdata->signal)) { |
From: <enl...@li...> - 2006-01-22 13:01:50
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps_error.c Log Message: After complaining about this, I realized I was guilty of cut'n'paste as much as anyone. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_apps_error.c 21 Jan 2006 18:15:23 -0000 1.3 +++ e_apps_error.c 22 Jan 2006 13:01:40 -0000 1.4 @@ -22,18 +22,19 @@ _e_app_error_dialog(E_Container *con, E_App_Autopsy *app) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); /* FIXME: Currenly this never gets free'd, awaiting the outcome of mailing list discussion. */ /* Dialog Methods */ - v.create_cfdata = _e_app_error_dialog_create_data; - v.free_cfdata = _e_app_error_dialog_free_data; - v.basic.apply_cfdata = NULL; - v.basic.create_widgets = _e_app_error_dialog_basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; + v->create_cfdata = _e_app_error_dialog_create_data; + v->free_cfdata = _e_app_error_dialog_free_data; +// v->basic.apply_cfdata = NULL; + v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets; +// v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, &v, app); + cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, v, app); app->error_dialog = cfd; } |
From: <enl...@li...> - 2006-01-22 14:18:29
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps_error.c e_config_dialog.c e_config_dialog.h Log Message: Allocate and free the view struct as per discussion. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_apps_error.c 22 Jan 2006 13:01:40 -0000 1.4 +++ e_apps_error.c 22 Jan 2006 14:18:20 -0000 1.5 @@ -24,18 +24,19 @@ E_Config_Dialog *cfd; E_Config_Dialog_View *v; - v = E_NEW(E_Config_Dialog_View, 1); /* FIXME: Currenly this never gets free'd, awaiting the outcome of mailing list discussion. */ - /* Dialog Methods */ - v->create_cfdata = _e_app_error_dialog_create_data; - v->free_cfdata = _e_app_error_dialog_free_data; -// v->basic.apply_cfdata = NULL; - v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets; -// v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; - - /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, v, app); - app->error_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); /* This gets freed by e_config_dialog. */ + if (v) + { + /* Dialog Methods */ + v->create_cfdata = _e_app_error_dialog_create_data; + v->free_cfdata = _e_app_error_dialog_free_data; + v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets; + v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; + + /* Create The Dialog */ + cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, v, app); + app->error_dialog = cfd; + } } static void =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_config_dialog.c 21 Jan 2006 12:44:48 -0000 1.18 +++ e_config_dialog.c 22 Jan 2006 14:18:20 -0000 1.19 @@ -25,14 +25,7 @@ cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, _e_config_dialog_free); - cfd->view = *view; - /* Seems that every user of this allocates view it on the stack and doesn't clear it, - * so I can't rely on this being NULL. I currently set it to NULL in e_config_dialog_new() - * and if you want to use it, set it in create_widgets(); - * I suspect that allocating a structure on the stack that lives beyond the function - * call is just asking for trouble. - */ - cfd->view.close_cfdata = NULL; + cfd->view = view; cfd->con = con; cfd->title = evas_stringshare_add(title); if (icon) @@ -43,7 +36,7 @@ cfd->data = data; cfd->hide_buttons = 1; - if ((cfd->view.basic.apply_cfdata) || (cfd->view.advanced.apply_cfdata)) + if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata)) cfd->hide_buttons = 0; _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC); @@ -60,7 +53,7 @@ if (cfd->icon) evas_stringshare_del(cfd->icon); if (cfd->cfdata) { - cfd->view.free_cfdata(cfd, cfd->cfdata); + cfd->view->free_cfdata(cfd, cfd->cfdata); cfd->cfdata = NULL; } if (cfd->dia) @@ -69,6 +62,7 @@ e_object_del(E_OBJECT(cfd->dia)); cfd->dia = NULL; } + E_FREE(cfd->view); free(cfd); } @@ -87,14 +81,14 @@ e_dialog_title_set(cfd->dia, cfd->title); if (cfd->icon) e_dialog_icon_set(cfd->dia, cfd->icon, cfd->icon_size); - if (!cfd->cfdata) cfd->cfdata = cfd->view.create_cfdata(cfd); + if (!cfd->cfdata) cfd->cfdata = cfd->view->create_cfdata(cfd); if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) { - if (cfd->view.advanced.create_widgets) + if (cfd->view->advanced.create_widgets) { o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0); - ob = cfd->view.basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + ob = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), _("Advanced"), "widget/new_dialog", @@ -102,14 +96,14 @@ e_widget_list_object_append(o, ob, 0, 0, 1.0); } else - o = cfd->view.basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); } else { - if (cfd->view.basic.create_widgets) + if (cfd->view->basic.create_widgets) { o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0); - ob = cfd->view.advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + ob = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), _("Basic"), "widget/new_dialog", @@ -117,7 +111,7 @@ e_widget_list_object_append(o, ob, 0, 0, 1.0); } else - o = cfd->view.advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + o = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); } e_widget_min_size_get(o, &mw, &mh); @@ -167,7 +161,7 @@ { E_Dialog *dia; E_Config_Dialog *cfd; - + dia = obj; cfd = dia->data; cfd->dia = NULL; @@ -183,13 +177,13 @@ cfd = dia->data; if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) { - if (cfd->view.basic.apply_cfdata) - ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata); + if (cfd->view->basic.apply_cfdata) + ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); } else { - if (cfd->view.advanced.apply_cfdata) - ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata); + if (cfd->view->advanced.apply_cfdata) + ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); } if (ok) e_object_del(E_OBJECT(cfd)); } @@ -203,13 +197,13 @@ cfd = dia->data; if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) { - if (cfd->view.basic.apply_cfdata) - ok = cfd->view.basic.apply_cfdata(cfd, cfd->cfdata); + if (cfd->view->basic.apply_cfdata) + ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); } else { - if (cfd->view.advanced.apply_cfdata) - ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata); + if (cfd->view->advanced.apply_cfdata) + ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); } if ((ok) && (!cfd->hide_buttons)) { @@ -256,8 +250,8 @@ int ok = 1; cfd = dia->data; - if (cfd->view.close_cfdata) - ok = cfd->view.close_cfdata(cfd, cfd->cfdata); + if (cfd->view->close_cfdata) + ok = cfd->view->close_cfdata(cfd, cfd->cfdata); if (ok) e_object_del(E_OBJECT(dia)); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_config_dialog.h 21 Jan 2006 12:44:48 -0000 1.7 +++ e_config_dialog.h 22 Jan 2006 14:18:20 -0000 1.8 @@ -23,10 +23,6 @@ { void *(*create_cfdata) (E_Config_Dialog *cfd); void (*free_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); - /* Seems that every user of this structure allocates it on the stack and doesn't clear it, - * so I can't rely on this being NULL. I currently set it to NULL in e_config_dialog_new() - * and if you want to use it, set it in create_widgets(); - */ int (*close_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); struct { int (*apply_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -39,7 +35,7 @@ E_Object e_obj_inherit; E_Config_Dialog_CFData_Type view_type; - E_Config_Dialog_View view; + E_Config_Dialog_View *view; E_Config_Dialog_Data *cfdata; E_Container *con; char *title; |
From: <enl...@li...> - 2006-01-22 18:14:57
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/itray Added Files: .cvsignore Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. |
From: <enl...@li...> - 2006-01-22 18:14:58
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/start Modified Files: .cvsignore e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/start/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 1 Jun 2005 14:28:57 -0000 1.1 +++ .cvsignore 22 Jan 2006 18:14:51 -0000 1.2 @@ -1,5 +1,5 @@ module.la -e_mod_main.lo +*.lo Makefile.in Makefile .libs =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/start/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 22 Jan 2006 14:15:13 -0000 1.3 +++ e_mod_config.c 22 Jan 2006 18:14:52 -0000 1.4 @@ -34,8 +34,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(con, _("Start Module Configuration"), NULL, 0, v, start); } |
From: <enl...@li...> - 2006-01-22 18:15:27
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/clock Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_config.c 22 Jan 2006 14:13:04 -0000 1.13 +++ e_mod_config.c 22 Jan 2006 18:14:51 -0000 1.14 @@ -36,8 +36,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* Create The Dialog */ cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, v, c); |
From: <enl...@li...> - 2006-01-22 18:15:27
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/dropshadow Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 22 Jan 2006 14:13:20 -0000 1.6 +++ e_mod_config.c 22 Jan 2006 18:14:51 -0000 1.7 @@ -38,8 +38,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), NULL, 0, v, ds); ds->config_dialog = cfd; |
From: <enl...@li...> - 2006-01-22 18:15:28
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c e_fileman_smart.c e_int_border_border.c e_int_border_locks.c e_int_border_remember.c e_int_config_background_import.c e_int_config_modules.c e_int_config_theme.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_eap_editor.c 14 Jan 2006 21:05:43 -0000 1.21 +++ e_eap_editor.c 22 Jan 2006 18:14:50 -0000 1.22 @@ -60,7 +60,7 @@ e_eap_edit_show(E_Container *con, E_App *a) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; E_App_Edit *editor; if (!con) return; @@ -71,15 +71,19 @@ editor->eap = a; editor->img = NULL; - /* methods */ - v.create_cfdata = _e_eap_edit_create_data; - v.free_cfdata = _e_eap_edit_free_data; - v.basic.apply_cfdata = _e_eap_edit_basic_apply_data; - v.basic.create_widgets = _e_eap_edit_basic_create_widgets; - v.advanced.apply_cfdata = _e_eap_edit_advanced_apply_data; - v.advanced.create_widgets = _e_eap_edit_advanced_create_widgets; - /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(con, _("Eap Editor"), NULL, 0, &v, editor); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _e_eap_edit_create_data; + v->free_cfdata = _e_eap_edit_free_data; + v->basic.apply_cfdata = _e_eap_edit_basic_apply_data; + v->basic.create_widgets = _e_eap_edit_basic_create_widgets; + v->advanced.apply_cfdata = _e_eap_edit_advanced_apply_data; + v->advanced.create_widgets = _e_eap_edit_advanced_create_widgets; + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(con, _("Eap Editor"), NULL, 0, v, editor); + } } /* local subsystem functions */ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -3 -r1.120 -r1.121 --- e_fileman_smart.c 14 Jan 2006 21:05:44 -0000 1.120 +++ e_fileman_smart.c 22 Jan 2006 18:14:50 -0000 1.121 @@ -1332,19 +1332,23 @@ { E_Fm_Icon *icon; E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; icon = data; - /* methods */ - v.create_cfdata = _e_fm_icon_prop_create_data; - v.free_cfdata = _e_fm_icon_prop_free_data; - v.basic.apply_cfdata = _e_fm_icon_prop_basic_apply_data; - v.basic.create_widgets = _e_fm_icon_prop_basic_create_widgets; - v.advanced.apply_cfdata = _e_fm_icon_prop_advanced_apply_data; - v.advanced.create_widgets = _e_fm_icon_prop_advanced_create_widgets; - /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, &v, icon); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _e_fm_icon_prop_create_data; + v->free_cfdata = _e_fm_icon_prop_free_data; + v->basic.apply_cfdata = _e_fm_icon_prop_basic_apply_data; + v->basic.create_widgets = _e_fm_icon_prop_basic_create_widgets; + v->advanced.apply_cfdata = _e_fm_icon_prop_advanced_apply_data; + v->advanced.create_widgets = _e_fm_icon_prop_advanced_create_widgets; + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, v, icon); + } } static void =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_border.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_int_border_border.c 14 Jan 2006 16:05:35 -0000 1.7 +++ e_int_border_border.c 22 Jan 2006 18:14:51 -0000 1.8 @@ -31,19 +31,21 @@ e_int_border_border(E_Border *bd) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - /* create config diaolg for bd object/data */ - cfd = e_config_dialog_new(bd->zone->container, - _("Window Border Selection"), NULL, 0, &v, bd); - bd->border_border_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + /* create config diaolg for bd object/data */ + cfd = e_config_dialog_new(bd->zone->container, + _("Window Border Selection"), NULL, 0, v, bd); + bd->border_border_dialog = cfd; + } } /**--CREATE--**/ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_locks.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_int_border_locks.c 14 Jan 2006 16:05:35 -0000 1.8 +++ e_int_border_locks.c 22 Jan 2006 18:14:51 -0000 1.9 @@ -49,19 +49,23 @@ e_int_border_locks(E_Border *bd) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - /* create config diaolg for bd object/data */ - cfd = e_config_dialog_new(bd->zone->container, - _("Window Locks"), NULL, 0, &v, bd); - bd->border_locks_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + /* create config diaolg for bd object/data */ + cfd = e_config_dialog_new(bd->zone->container, + _("Window Locks"), NULL, 0, v, bd); + bd->border_locks_dialog = cfd; + } } /**--CREATE--**/ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_remember.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_border_remember.c 14 Jan 2006 16:05:35 -0000 1.6 +++ e_int_border_remember.c 22 Jan 2006 18:14:51 -0000 1.7 @@ -51,19 +51,23 @@ e_int_border_remember(E_Border *bd) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - /* create config dialog for bd object/data */ - cfd = e_config_dialog_new(bd->zone->container, - _("Window Remember"), NULL, 0, &v, bd); - bd->border_remember_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + /* create config dialog for bd object/data */ + cfd = e_config_dialog_new(bd->zone->container, + _("Window Remember"), NULL, 0, v, bd); + bd->border_remember_dialog = cfd; + } } /**--CREATE--**/ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_int_config_background_import.c 22 Jan 2006 15:51:51 -0000 1.4 +++ e_int_config_background_import.c 22 Jan 2006 18:14:51 -0000 1.5 @@ -107,8 +107,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(parent->con, _("Import An Image"), NULL, 0, v, NULL); e_dialog_resizable_set(cfd->dia, 1); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_modules.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_int_config_modules.c 22 Jan 2006 14:12:17 -0000 1.20 +++ e_int_config_modules.c 22 Jan 2006 18:14:51 -0000 1.21 @@ -64,9 +64,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - /* Disable For Now */ - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, _("Module Settings"), NULL, 0, v, NULL); return cfd; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_theme.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_int_config_theme.c 22 Jan 2006 14:12:17 -0000 1.13 +++ e_int_config_theme.c 22 Jan 2006 18:14:51 -0000 1.14 @@ -42,8 +42,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, _("Theme Selector"), NULL, 0, v, NULL); return cfd; |
From: <enl...@li...> - 2006-01-23 18:20:10
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Added Files: gdb.txt xnest.sh Log Message: Debugging script and support file. |
From: <enl...@li...> - 2006-01-23 18:29:56
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Added Files: e17_tlist_bg0.png e17_tlist_bg1.png Log Message: Raster said to stop hacking ilist and create another widget. This is the default theme for that widget. Do we usually clone inages, or just use the ones from other widgets? |
From: Carsten H. (T. R. <ra...@ra...> - 2006-01-24 03:08:20
|
On Mon, 23 Jan 2006 10:29:49 -0800 enl...@li... babbled: > Enlightenment CVS committal > > Author : onefang > Project : e17 > Module : apps/e > > Dir : e17/apps/e/data/themes/images > > > Added Files: > e17_tlist_bg0.png e17_tlist_bg1.png > > > Log Message: > Raster said to stop hacking ilist and create another widget. This is the > default theme for that widget. > > Do we usually clone inages, or just use the ones from other widgets? we re-use images from other objects - add a new images {} section for that group, but -re-use the image file name :) -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ra...@ra... 裸好多 Tokyo, Japan (東京 日本) |
From: <enl...@li...> - 2006-01-23 18:29:56
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Added Files: default_tlist.edc Log Message: Raster said to stop hacking ilist and create another widget. This is the default theme for that widget. Do we usually clone inages, or just use the ones from other widgets? |
From: <enl...@li...> - 2006-01-23 18:33:26
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Added Files: e_tlist.c e_tlist.h e_widget_tlist.c e_widget_tlist.h Log Message: Raster said to stop hacking ilist and create another widget. These are the source files for that widget. |
From: <enl...@li...> - 2006-01-23 18:37:32
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: Makefile.am Log Message: Raster said to stop hacking ilist and create another widget. Link the new theme in. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/images/Makefile.am,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- Makefile.am 6 Jan 2006 13:56:45 -0000 1.46 +++ Makefile.am 23 Jan 2006 18:37:22 -0000 1.47 @@ -410,6 +410,8 @@ e17_sb_runnerv.png \ e17_ilist_bg0.png \ e17_ilist_bg1.png \ +e17_tlist_bg0.png \ +e17_tlist_bg1.png \ e17_slider_bt0.png \ e17_slider_bt1.png \ e17_slider_bt_glow.png \ |
From: <enl...@li...> - 2006-01-23 18:37:37
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: Makefile.am default.edc Log Message: Raster said to stop hacking ilist and create another widget. Link the new theme in. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/Makefile.am,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- Makefile.am 20 Jan 2006 04:04:12 -0000 1.36 +++ Makefile.am 23 Jan 2006 18:37:22 -0000 1.37 @@ -49,6 +49,7 @@ default_button.edc \ default_scrollframe.edc \ default_ilist.edc \ +default_tlist.edc \ default_slider.edc \ default_exebuf.edc =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default.edc,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- default.edc 20 Jan 2006 04:04:12 -0000 1.57 +++ default.edc 23 Jan 2006 18:37:22 -0000 1.58 @@ -57,6 +57,7 @@ #include "default_label.edc" #include "default_scrollframe.edc" #include "default_ilist.edc" +#include "default_tlist.edc" #include "default_slider.edc" #include "default_exebuf.edc" } |
From: <enl...@li...> - 2006-01-23 18:41:06
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am Log Message: Raster said to stop hacking ilist and create another widget. Link the source code in. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- Makefile.am 22 Jan 2006 14:11:15 -0000 1.96 +++ Makefile.am 23 Jan 2006 18:40:57 -0000 1.97 @@ -113,9 +113,11 @@ e_file_dialog.h \ e_int_border_menu.h \ e_ilist.h \ +e_tlist.h \ e_livethumb.h \ e_int_border_border.h \ e_widget_ilist.h \ +e_widget_tlist.h \ e_slider.h \ e_widget_slider.h \ e_int_config_window_manipulation.h \ @@ -226,9 +228,11 @@ e_file_dialog.c \ e_int_border_menu.c \ e_ilist.c \ +e_tlist.c \ e_livethumb.c \ e_int_border_border.c \ e_widget_ilist.c \ +e_widget_tlist.c \ e_slider.c \ e_widget_slider.c \ e_int_config_window_manipulation.c \ |