From: Enlightenment C. <no...@cv...> - 2007-08-03 22:44:53
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules Modified Files: Makefile.am Log Message: New configuration dialog 'engine'. Only basic mode for now, advanced stuff will follow soon. :) =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- Makefile.am 1 Aug 2007 12:37:01 -0000 1.35 +++ Makefile.am 3 Aug 2007 22:44:21 -0000 1.36 @@ -23,6 +23,7 @@ conf_intl \ conf_imc \ conf_profiles \ +conf_engine \ conf_applications \ conf_desks \ conf_desk \ |
From: Enlightenment C. <no...@cv...> - 2007-08-06 23:35:15
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: Don't show menu entry for configuring virtual desktops if conf_desks isn't loaded. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.216 retrieving revision 1.217 diff -u -3 -r1.216 -r1.217 --- e_mod_main.c 24 Jul 2007 18:47:26 -0000 1.216 +++ e_mod_main.c 6 Aug 2007 23:35:13 -0000 1.217 @@ -760,10 +760,13 @@ e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_menu_item_callback_set(mi, _pager_inst_cb_menu_configure, NULL); - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Virtual Desktops Configuration")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/vdesktops"); - e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst); + if (e_configure_registry_exists("screen/virtual_desktops")) + { + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Virtual Desktops Configuration")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/vdesktops"); + e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst); + } e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0); |
From: Enlightenment C. <no...@cv...> - 2007-08-11 20:03:23
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_engine Modified Files: e_int_config_engine.c Log Message: Checkbox for composite. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_engine/e_int_config_engine.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_engine.c 3 Aug 2007 22:44:21 -0000 1.1 +++ e_int_config_engine.c 11 Aug 2007 20:03:21 -0000 1.2 @@ -12,6 +12,7 @@ { E_Config_Dialog *cfd; + int use_composite; int evas_engine_default; }; @@ -50,6 +51,7 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { + cfdata->use_composite = e_config->use_composite; cfdata->evas_engine_default = e_config->evas_engine_default; } @@ -62,6 +64,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { + e_config->use_composite = cfdata->use_composite; e_config->evas_engine_default = cfdata->evas_engine_default; e_config_save_queue(); return 1; @@ -76,7 +79,12 @@ int engine; o = e_widget_list_add(evas, 0, 0); - + + of = e_widget_framelist_add(evas, _("General Settings"), 0); + ob = e_widget_check_add(evas, _("Enable Composite"), &(cfdata->use_composite)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + of = e_widget_framelist_add(evas, _("Default Engine"), 0); rg = e_widget_radio_group_new(&(cfdata->evas_engine_default)); for (l = e_config_engine_list(); l; l = l->next) |
From: Enlightenment C. <no...@cv...> - 2007-08-11 20:03:52
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.h Log Message: Checkbox for composite. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.160 retrieving revision 1.161 diff -u -3 -r1.160 -r1.161 --- e_config.h 29 Jul 2007 10:24:53 -0000 1.160 +++ e_config.h 11 Aug 2007 20:03:21 -0000 1.161 @@ -103,7 +103,7 @@ int edge_flip_dragging; // GUI int edge_flip_moving; // GUI double edge_flip_timeout; // GUI - int evas_engine_default; + int evas_engine_default; // GUI int evas_engine_container; // NO GUI - maybe remove? int evas_engine_init; // NO GUI - maybe remove? int evas_engine_menus; // NO GUI - maybe remove? @@ -113,7 +113,7 @@ int evas_engine_drag; // NO GUI - maybe remove? int evas_engine_win; // NO GUI - maybe remove? int evas_engine_zone; // NO GUI - maybe remove? - int use_composite; // NO GUI + int use_composite; // GUI const char *language; // GUI Evas_List *modules; // GUI Evas_List *font_fallbacks; // GUI |
From: Enlightenment C. <no...@cv...> - 2007-08-20 14:28:27
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_actions.c Log Message: Do not allow to kill internal windows using the kill keybinding. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -3 -r1.106 -r1.107 --- e_actions.c 15 Aug 2007 05:48:47 -0000 1.106 +++ e_actions.c 20 Aug 2007 14:28:21 -0000 1.107 @@ -293,6 +293,9 @@ obj = E_OBJECT(e_border_focused_get()); if (!obj) return; } + bd = (E_Border *)obj; + if ((bd->lock_close) || (bd->internal)) return; + if (kill_dialog) e_object_del(E_OBJECT(kill_dialog)); if (e_config->cnfmdlg_disabled) @@ -301,7 +304,6 @@ return; } - bd = (E_Border *)obj; snprintf(dialog_text, sizeof(dialog_text), _("You are about to kill %s.<br><br>" "Please keep in mind that all data of this window,<br>" |
From: Enlightenment C. <no...@cv...> - 2007-08-26 21:41:22
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: e_int_config_profiles.c module.desktop.in Log Message: Reset new profile type; module description added. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_int_config_profiles.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_int_config_profiles.c 3 Aug 2007 10:20:35 -0000 1.4 +++ e_int_config_profiles.c 26 Aug 2007 21:41:20 -0000 1.5 @@ -304,6 +304,7 @@ e_object_unref(E_OBJECT(dia)); cfdata->dia_new_profile = NULL; cfdata->new_profile = NULL; + cfdata->new_profile_type = 0; } static void @@ -331,6 +332,7 @@ e_object_unref(E_OBJECT(dia)); cfdata->dia_new_profile = NULL; cfdata->new_profile = NULL; + cfdata->new_profile_type = 0; _ilist_fill(cfdata); } @@ -342,5 +344,6 @@ cfdata->dia_new_profile = NULL; cfdata->new_profile = NULL; + cfdata->new_profile_type = 0; e_object_unref(E_OBJECT(dia)); } =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/module.desktop.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- module.desktop.in 16 Jul 2007 00:45:58 -0000 1.1 +++ module.desktop.in 26 Aug 2007 21:41:20 -0000 1.2 @@ -2,3 +2,4 @@ Type=Link Name=Configuration - Profiles Icon=e-module-conf_profiles +Comment=<hilight>E17 Configuration Applet</hilight><br>Allows to manage configuration profiles. |
From: Enlightenment C. <no...@cv...> - 2007-08-28 10:58:38
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_actions.c Log Message: Patch by schula, fix window push for xinerama screens. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v retrieving revision 1.107 retrieving revision 1.108 diff -u -3 -r1.107 -r1.108 --- e_actions.c 20 Aug 2007 14:28:21 -0000 1.107 +++ e_actions.c 28 Aug 2007 10:58:33 -0000 1.108 @@ -860,13 +860,13 @@ y = bd->y; if (dir == E_DIRECTION_LEFT) - x = 0; + x = bd->zone->x; else if (dir == E_DIRECTION_RIGHT) - x = bd->zone->w - bd->w; + x = bd->zone->x + bd->zone->w - bd->w; else if (dir == E_DIRECTION_UP) - y = 0; + y = bd->zone->y; else /* dir == E_DIRECTION_DOWN */ - y = bd->zone->h - bd->h; + y = bd->zone->y + bd->zone->h - bd->h; bd_list = e_container_border_list_first(bd->zone->container); cur = e_container_border_list_next(bd_list); @@ -882,7 +882,7 @@ else if ((dir == E_DIRECTION_RIGHT) && (cur->x > bd->x + bd->w) && (E_SPANS_COMMON(bd->y, bd->h, cur->y, cur->h))) - x = MIN(x, cur->x - bd->w); + x = MIN(x, bd->zone->x + cur->x - bd->w); else if ((dir == E_DIRECTION_UP) && (cur->y + cur->h < bd->y) && (E_SPANS_COMMON(bd->x, bd->w, cur->x, cur->w))) @@ -890,7 +890,7 @@ else if ((dir == E_DIRECTION_DOWN) && (cur->y > bd->y + bd->h) && (E_SPANS_COMMON(bd->x, bd->w, cur->x, cur->w))) - y = MIN(y, cur->y - bd->h); + y = MIN(y, bd->zone->y + cur->y - bd->h); } cur = e_container_border_list_next(bd_list); } |
From: Enlightenment C. <no...@cv...> - 2007-08-28 11:01:32
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: module.desktop.in Log Message: Fix wording as suggested by Zachary Goldberg. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/module.desktop.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- module.desktop.in 26 Aug 2007 21:41:20 -0000 1.2 +++ module.desktop.in 28 Aug 2007 11:01:29 -0000 1.3 @@ -2,4 +2,4 @@ Type=Link Name=Configuration - Profiles Icon=e-module-conf_profiles -Comment=<hilight>E17 Configuration Applet</hilight><br>Allows to manage configuration profiles. +Comment=<hilight>E17 Configuration Applet</hilight><br>Allows management of configuration profiles. |
From: Enlightenment C. <no...@cv...> - 2007-08-31 20:41:58
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: xnest.sh Log Message: This is a bash script, so don't use bad alias shebang. =================================================================== RCS file: /cvs/e/e17/apps/e/xnest.sh,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- xnest.sh 24 Mar 2007 15:01:50 -0000 1.17 +++ xnest.sh 31 Aug 2007 20:41:47 -0000 1.18 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #export REDRAW_DEBUG=1 # To cause redraw- to happen slovly and obviously. #export ECORE_ERROR_ABORT=1 # To cause ecore to abort on errors. |
From: Enlightenment C. <no...@cv...> - 2007-09-04 23:59:10
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.c e_config.h e_desk.c e_int_shelf_config.c e_shelf.c Log Message: This allows to have shelfs only on specified desktops. Someone might want to add a nice hide/show animation... =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v retrieving revision 1.266 retrieving revision 1.267 diff -u -3 -r1.266 -r1.267 --- e_config.c 18 Aug 2007 10:37:16 -0000 1.266 +++ e_config.c 4 Sep 2007 23:59:01 -0000 1.267 @@ -39,6 +39,7 @@ static E_Config_DD *_e_config_gadcon_edd = NULL; static E_Config_DD *_e_config_gadcon_client_edd = NULL; static E_Config_DD *_e_config_shelf_edd = NULL; +static E_Config_DD *_e_config_shelf_desk_edd = NULL; static E_Config_DD *_e_config_mime_icon_edd = NULL; EAPI int E_EVENT_CONFIG_ICON_THEME = 0; @@ -108,6 +109,14 @@ E_CONFIG_VAL(D, T, name, STR); E_CONFIG_VAL(D, T, id, STR); E_CONFIG_LIST(D, T, clients, _e_config_gadcon_client_edd); + + _e_config_shelf_desk_edd = E_CONFIG_DD_NEW("E_Config_Shelf_Desk", E_Config_Shelf_Desk); +#undef T +#undef D +#define T E_Config_Shelf_Desk +#define D _e_config_shelf_desk_edd + E_CONFIG_VAL(D, T, x, INT); + E_CONFIG_VAL(D, T, y, INT); _e_config_shelf_edd = E_CONFIG_DD_NEW("E_Config_Shelf", E_Config_Shelf); #undef T @@ -129,7 +138,9 @@ E_CONFIG_VAL(D, T, autohide_show_action, INT); E_CONFIG_VAL(D, T, hide_timeout, FLOAT); E_CONFIG_VAL(D, T, hide_duration, FLOAT); - + E_CONFIG_VAL(D, T, desk_show_mode, INT); + E_CONFIG_LIST(D, T, desk_list, _e_config_shelf_desk_edd); + _e_config_desktop_bg_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Background", E_Config_Desktop_Background); #undef T #undef D @@ -1220,7 +1231,7 @@ { E_Config_Shelf *cf_es; -#define CFG_SHELF(_name, _con, _zone, _pop, _lay, _orient, _fita, _fits, _style, _size, _overlap, _autohide, _autohide_show_action, _hide_timeout, _hide_duration) \ +#define CFG_SHELF(_name, _con, _zone, _pop, _lay, _orient, _fita, _fits, _style, _size, _overlap, _autohide, _autohide_show_action, _hide_timeout, _hide_duration, _desk_show_mode, _desk_list) \ cf_es = E_NEW(E_Config_Shelf, 1); \ cf_es->name = evas_stringshare_add(_name); \ cf_es->container = _con; \ @@ -1237,30 +1248,32 @@ cf_es->autohide_show_action = _autohide_show_action; \ cf_es->hide_timeout = _hide_timeout; \ cf_es->hide_duration = _hide_duration; \ + cf_es->desk_show_mode = _desk_show_mode; \ + cf_es->desk_list = evas_list_append(cf_es->desk_list, cf_es); \ e_config->shelves = evas_list_append(e_config->shelves, cf_es) /* shelves for 4 zones on head 0 by default */ CFG_SHELF("shelf", 0, 0, 1, 200, E_GADCON_ORIENT_BOTTOM, - 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0); + 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL); CFG_SHELF("shelf", 0, 1, 1, 200, E_GADCON_ORIENT_BOTTOM, - 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0); + 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL); CFG_SHELF("shelf", 0, 2, 1, 200, E_GADCON_ORIENT_BOTTOM, - 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0); + 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL); CFG_SHELF("shelf", 0, 3, 1, 200, E_GADCON_ORIENT_BOTTOM, - 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0); + 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL); /* shelves for heada 1, 2, and 3 by default */ CFG_SHELF("shelf", 1, 0, 1, 200, E_GADCON_ORIENT_BOTTOM, - 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0); + 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL); CFG_SHELF("shelf", 2, 0, 1, 200, E_GADCON_ORIENT_BOTTOM, - 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0); + 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL); CFG_SHELF("shelf", 3, 0, 1, 200, E_GADCON_ORIENT_BOTTOM, - 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0); + 1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL); } IFCFGEND; @@ -1633,6 +1646,7 @@ E_CONFIG_DD_FREE(_e_config_gadcon_edd); E_CONFIG_DD_FREE(_e_config_gadcon_client_edd); E_CONFIG_DD_FREE(_e_config_shelf_edd); + E_CONFIG_DD_FREE(_e_config_shelf_desk_edd); return 1; } =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.161 retrieving revision 1.162 diff -u -3 -r1.161 -r1.162 --- e_config.h 11 Aug 2007 20:03:21 -0000 1.161 +++ e_config.h 4 Sep 2007 23:59:01 -0000 1.162 @@ -37,6 +37,7 @@ typedef struct _E_Config_Gadcon E_Config_Gadcon; typedef struct _E_Config_Gadcon_Client E_Config_Gadcon_Client; typedef struct _E_Config_Shelf E_Config_Shelf; +typedef struct _E_Config_Shelf_Desk E_Config_Shelf_Desk; typedef struct _E_Config_Mime_Icon E_Config_Mime_Icon; typedef struct _E_Event_Config_Icon_Theme E_Event_Config_Icon_Theme; @@ -412,6 +413,13 @@ int autohide_show_action; float hide_timeout; float hide_duration; + int desk_show_mode; + Evas_List *desk_list; +}; + +struct _E_Config_Shelf_Desk +{ + int x, y; }; struct _E_Config_Mime_Icon =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -3 -r1.66 -r1.67 --- e_desk.c 25 Apr 2007 11:28:35 -0000 1.66 +++ e_desk.c 4 Sep 2007 23:59:01 -0000 1.67 @@ -200,6 +200,7 @@ E_Border_List *bl; E_Border *bd; E_Event_Desk_Show *ev; + Evas_List *l; int was_zone = 0; int x, y, dx = 0, dy = 0; @@ -275,6 +276,33 @@ ev->desk = desk; e_object_ref(E_OBJECT(desk)); ecore_event_add(E_EVENT_DESK_SHOW, ev, _e_border_event_desk_show_free, NULL); + + for (l = e_shelf_list(); l; l = l->next) + { + Evas_List *ll; + E_Shelf *es; + int show_shelf=0; + + es = l->data; + if (!es->cfg->desk_show_mode) continue; + + for (ll = es->cfg->desk_list; ll; ll = ll->next) + { + E_Config_Shelf_Desk *sd; + + sd = ll->data; + if (!sd) continue; + if ((desk->x == sd->x) && (desk->y == sd->y)) + { + show_shelf=1; + break; + } + } + if (show_shelf) + e_shelf_show (es); + else + e_shelf_hide (es); + } } EAPI void =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_int_shelf_config.c 18 Jun 2007 11:29:02 -0000 1.30 +++ e_int_shelf_config.c 4 Sep 2007 23:59:01 -0000 1.31 @@ -39,6 +39,11 @@ int autohiding_show_action; double hide_timeout; double hide_duration; + + int desk_show_mode; + Evas_List *desk_list; + + Evas_Object *desk_sel_list; }; /* a nice easy setup function that does the dirty work */ @@ -123,6 +128,8 @@ cfdata->autohiding_show_action = cfdata->escfg->autohide_show_action; cfdata->hide_timeout = cfdata->escfg->hide_timeout; cfdata->hide_duration = cfdata->escfg->hide_duration; + cfdata->desk_show_mode = cfdata->escfg->desk_show_mode; + cfdata->desk_list = cfdata->escfg->desk_list; if (cfdata->size <= 24) cfdata->basic_size = 24; else if (cfdata->size <= 32) @@ -147,6 +154,46 @@ cfdata->layering = 2; } +static void +_desk_sel_list_load(E_Config_Dialog_Data *cfdata) +{ + Evas *evas; + int x, y; + + if (!cfdata->desk_sel_list) return; + evas = evas_object_evas_get(cfdata->desk_sel_list); + evas_event_freeze(evas); + edje_freeze(); + e_widget_ilist_freeze(cfdata->desk_sel_list); + e_widget_ilist_clear(cfdata->desk_sel_list); + + for (y = 0; y < e_config->zone_desks_y_count; y++) + for (x = 0; x < e_config->zone_desks_x_count; x++) + { + E_Desk *desk; + Evas_List *l = NULL; + + desk = e_desk_at_xy_get(cfdata->es->zone, x, y); + e_widget_ilist_append(cfdata->desk_sel_list, NULL, desk->name, NULL, NULL, NULL); + + for (l = cfdata->desk_list; l; l = l->next) + { + E_Config_Shelf_Desk *sd; + + sd = l->data; + if (!sd) continue; + if ((sd->x != x) || (sd->y != y)) continue; + + e_widget_ilist_multi_select(cfdata->desk_sel_list, e_widget_ilist_count(cfdata->desk_sel_list)); + break; + } + } + e_widget_ilist_go(cfdata->desk_sel_list); + e_widget_ilist_thaw(cfdata->desk_sel_list); + edje_thaw(); + evas_event_thaw(evas); +} + static void * _create_data(E_Config_Dialog *cfd) { @@ -253,7 +300,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { E_Zone *zone; - int id; + int id, idx, x, y; int restart = 0; /* Only change style is we need to */ @@ -354,6 +401,32 @@ else if (!cfdata->escfg->autohide && cfdata->es->hidden) e_shelf_toggle(cfdata->es, 1); + cfdata->escfg->desk_show_mode = cfdata->desk_show_mode; + cfdata->escfg->desk_list = NULL; + if (cfdata->desk_show_mode) + { + Evas_List *l; + Evas_List *desk_list = NULL; + for (idx = 0, l = e_widget_ilist_items_get(cfdata->desk_sel_list); l; l = l->next, idx++) + { + E_Ilist_Item *item; + E_Desk *desk; + E_Config_Shelf_Desk *sd; + + item = l->data; + if ((!item) || (!item->selected)) continue; + + desk = e_desk_at_pos_get(cfdata->es->zone, idx); + if (!desk) continue; + + sd = E_NEW(E_Config_Shelf_Desk, 1); + sd->x = desk->x; + sd->y = desk->y; + desk_list = evas_list_append(desk_list, sd); + } + cfdata->escfg->desk_list = desk_list; + } + if (restart) { zone = cfdata->es->zone; @@ -371,8 +444,31 @@ e_shelf_orient(cfdata->es, cfdata->escfg->orient); e_shelf_position_calc(cfdata->es); e_shelf_populate(cfdata->es); - e_shelf_show(cfdata->es); } + if (cfdata->escfg->desk_show_mode) + { + E_Desk *desk; + Evas_List *l; + int show_shelf=0; + + desk = e_desk_current_get(cfdata->es->zone); + for (l = cfdata->escfg->desk_list; l; l = l->next) + { + E_Config_Shelf_Desk *sd; + sd = l->data; + if ((desk->x == sd->x) && (desk->y == sd->y)) + { + show_shelf=1; + break; + } + } + if (show_shelf) + e_shelf_show(cfdata->es); + else + e_shelf_hide(cfdata->es); + } + else + e_shelf_show(cfdata->es); e_config_save_queue(); cfdata->es->config_dialog = cfd; @@ -561,6 +657,23 @@ e_widget_framelist_object_append(of, ob); ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.1, 2.0, 0.1, 0, &(cfdata->hide_duration), NULL, 60); e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o2, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Desktop"), 0); + rg = e_widget_radio_group_new(&(cfdata->desk_show_mode)); + ob = e_widget_radio_add(evas, _("Show on all Desktops"), 0, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("Show on specified Desktops"), 1, rg); + e_widget_framelist_object_append(of, ob); + + ob = e_widget_ilist_add(evas, 16, 16, NULL); + cfdata->desk_sel_list = ob; + e_widget_ilist_multi_select_set(ob, 1); + _desk_sel_list_load(cfdata); + e_widget_min_size_get(ob, &wmw, &wmh); + e_widget_min_size_set(ob, wmw, 64); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o2, of, 1, 1, 0.5); e_widget_list_object_append(o, o2, 0, 0, 0.0); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- e_shelf.c 16 Jul 2007 20:43:13 -0000 1.69 +++ e_shelf.c 4 Sep 2007 23:59:01 -0000 1.70 @@ -87,7 +87,28 @@ e_shelf_orient(es, cf_es->orient); e_shelf_position_calc(es); e_shelf_populate(es); - e_shelf_show(es); + + if (cf_es->desk_show_mode) + { + E_Desk *desk; + Evas_List *ll; + + desk = e_desk_current_get(zone); + for (ll = cf_es->desk_list; ll; ll = ll->next) + { + E_Config_Shelf_Desk *sd; + + sd = ll->data; + if ((desk->x == sd->x) && (desk->y == sd->y)) + { + e_shelf_show(es); + break; + } + } + } + else + e_shelf_show(es); + e_shelf_toggle(es, 0); } } |
From: Enlightenment C. <no...@cv...> - 2007-09-19 01:29:24
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c Log Message: It's now possible to have efm in the ibar, using a desktop file with type=link and url=file:/path/to/enlightenment . =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.185 retrieving revision 1.186 diff -u -3 -r1.185 -r1.186 --- e_mod_main.c 16 Sep 2007 14:11:38 -0000 1.185 +++ e_mod_main.c 19 Sep 2007 01:29:04 -0000 1.186 @@ -828,7 +828,19 @@ ic = data; if ((ev->button == 1) && (!ic->drag.dnd) && (ic->mouse_down == 1)) { - e_exec(ic->ibar->inst->gcc->gadcon->zone, ic->app, NULL, NULL, "ibar"); + if (ic->app->type == EFREET_DESKTOP_TYPE_APPLICATION) + e_exec(ic->ibar->inst->gcc->gadcon->zone, ic->app, NULL, NULL, "ibar"); + if (ic->app->type == EFREET_DESKTOP_TYPE_LINK) + { + if (strncasecmp (ic->app->url, "file:", 5) == 0) + { + E_Action *act; + + act = e_action_find("fileman"); + if (act) act->func.go (E_OBJECT(obj), ic->app->url+5); + } + } + ic->drag.start = 0; ic->drag.dnd = 0; ic->mouse_down = 0; |
From: Enlightenment C. <no...@cv...> - 2007-09-19 01:29:38
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/fileman Modified Files: e_mod_main.c Log Message: It's now possible to have efm in the ibar, using a desktop file with type=link and url=file:/path/to/enlightenment . =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_mod_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_main.c 13 Sep 2007 21:18:44 -0000 1.8 +++ e_mod_main.c 19 Sep 2007 01:29:04 -0000 1.9 @@ -182,7 +182,13 @@ zone = e_util_zone_current_get(e_manager_current_get()); } if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); - if (zone) e_fwin_new(zone->container, "favorites", "/"); + if (zone) + { + if (params) + e_fwin_new(zone->container, NULL, params); + else + e_fwin_new(zone->container, "favorites", "/"); + } } /* menu item callback(s) */ |
From: Enlightenment C. <no...@cv...> - 2007-09-26 12:34:41
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_desk.c Log Message: Bug fixed: Having a shelf only visible on specific desktops didn't work corrently with dualscreen setup. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- e_desk.c 4 Sep 2007 23:59:01 -0000 1.67 +++ e_desk.c 26 Sep 2007 12:34:38 -0000 1.68 @@ -281,10 +281,18 @@ { Evas_List *ll; E_Shelf *es; + E_Config_Shelf *cf_es; + E_Zone *zone; int show_shelf=0; es = l->data; + if (!es) continue; if (!es->cfg->desk_show_mode) continue; + cf_es = es->cfg; + if (!cf_es) continue; + + zone = e_zone_current_get(e_container_current_get(e_manager_current_get())); + if (cf_es->zone != zone->num) continue; for (ll = es->cfg->desk_list; ll; ll = ll->next) { |
From: Enlightenment C. <no...@cv...> - 2007-09-30 23:21:56
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_maximize.c Log Message: Fix for shelfs on specified desktops: Do not maximize until a shelf which is only visible on other desktops. (http://bugs.enlightenment.org/show_bug.cgi?id=199) =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_maximize.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_maximize.c 20 Jul 2007 08:27:59 -0000 1.20 +++ e_maximize.c 30 Sep 2007 23:21:54 -0000 1.21 @@ -133,12 +133,32 @@ for (l = e_shelf_list(); l; l = l->next) { E_Shelf *es; + Evas_List *ll; es = l->data; if (es->cfg->overlap) continue; if (es->zone != bd->zone) continue; - OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, - es->x + es->zone->x + es->w, es->y + es->zone->y + es->h); + if (es->cfg->desk_show_mode) + { + for (ll = es->cfg->desk_list; ll; ll = ll->next) + { + E_Config_Shelf_Desk *sd; + + sd = ll->data; + if (!sd) continue; + if ((sd->x == bd->desk->x) && (sd->y == bd->desk->y)) + { + OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, + es->x + es->zone->x + es->w, es->y + es->zone->y + es->h); + break; + } + } + } + else + { + OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, + es->x + es->zone->x + es->w, es->y + es->zone->y + es->h); + } } if (rects) { |
From: Enlightenment C. <no...@cv...> - 2007-09-30 23:52:28
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_resist.c Log Message: Fixing http://bugs.enlightenment.org/show_bug.cgi?id=199: No resistance when moving windows on a desktop where a 'specified desktops shelf' isn't visible. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_resist.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_resist.c 21 Aug 2006 15:52:58 -0000 1.16 +++ e_resist.c 30 Sep 2007 23:52:24 -0000 1.17 @@ -24,6 +24,7 @@ E_Resist_Rect *r; E_Border_List *bl; E_Border *bd; + E_Desk *desk; if (!e_config->use_resist) { @@ -85,15 +86,36 @@ } e_container_border_list_free(bl); + desk = e_desk_current_get(e_zone_current_get(con)); for (l = e_shelf_list(); l; l = l->next) { E_Shelf *es; + Evas_List *ll; es = l->data; if (es->zone->container == con) { - OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h, - e_config->gadget_resist); + if (es->cfg->desk_show_mode) + { + for (ll = es->cfg->desk_list; ll; ll = ll->next) + { + E_Config_Shelf_Desk *sd; + + sd = ll->data; + if (!sd) continue; + if ((sd->x == desk->x) && (sd->y == desk->y)) + { + OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h, + e_config->gadget_resist); + break; + } + } + } + else + { + OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h, + e_config->gadget_resist); + } } } if (rects) |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:22:44
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_gradient.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_wallpaper_gradient.c 4 Jul 2007 15:09:24 -0000 1.1 +++ e_int_config_wallpaper_gradient.c 7 Oct 2007 21:22:41 -0000 1.2 @@ -129,7 +129,7 @@ evas_object_show(o); e_widget_table_object_append(ott, o, 0, 2, 1, 1, 0, 1, 0, 1); - o = e_widget_entry_add(evas, &(cfdata->name)); + o = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL); evas_object_show(o); e_widget_table_object_append(ott, o, 1, 0, 1, 1, 1, 1, 1, 1); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:17
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_intl Modified Files: e_int_config_intl.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_intl/e_int_config_intl.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_intl.c 24 Jul 2007 18:47:25 -0000 1.2 +++ e_int_config_intl.c 7 Oct 2007 21:22:40 -0000 1.3 @@ -942,7 +942,7 @@ of = e_widget_frametable_add(evas, _("Locale Selected"), 0); ob = e_widget_label_add(evas, _("Locale")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); - ob = e_widget_entry_add(evas, &(cfdata->cur_language)); + ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL); cfdata->gui.locale_entry = ob; e_widget_disabled_set(cfdata->gui.locale_entry, 1); e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25); @@ -1020,7 +1020,7 @@ of = e_widget_frametable_add(evas, _("Locale Selected"), 0); ob = e_widget_label_add(evas, _("Locale")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); - ob = e_widget_entry_add(evas, &(cfdata->cur_language)); + ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL); cfdata->gui.locale_entry = ob; e_widget_disabled_set(cfdata->gui.locale_entry, 1); e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:17
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_imc Modified Files: e_int_config_imc.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_imc/e_int_config_imc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_imc.c 24 Jul 2007 18:47:25 -0000 1.3 +++ e_int_config_imc.c 7 Oct 2007 21:22:40 -0000 1.4 @@ -906,21 +906,21 @@ o = e_widget_label_add(evas, _("Name")); e_widget_frametable_object_append(ol, o, 0, 0, 1, 1, 1, 1, 0, 0); - o = e_widget_entry_add(evas, &(cfdata->imc.e_im_name)); + o = e_widget_entry_add(evas, &(cfdata->imc.e_im_name), NULL, NULL, NULL); e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata); cfdata->gui.e_im_name = o; e_widget_frametable_object_append(ol, o, 1, 0, 1, 1, 1, 1, 1, 0); o = e_widget_label_add(evas, _("Execute Command")); e_widget_frametable_object_append(ol, o, 0, 1, 1, 1, 1, 1, 0, 0); - o = e_widget_entry_add(evas, &(cfdata->imc.e_im_exec)); + o = e_widget_entry_add(evas, &(cfdata->imc.e_im_exec), NULL, NULL, NULL); e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata); cfdata->gui.e_im_exec = o; e_widget_frametable_object_append(ol, o, 1, 1, 1, 1, 1, 1, 1, 0); o = e_widget_label_add(evas, _("Setup Command")); e_widget_frametable_object_append(ol, o, 0, 2, 1, 1, 1, 1, 0, 0); - o = e_widget_entry_add(evas, &(cfdata->imc.e_im_setup_exec)); + o = e_widget_entry_add(evas, &(cfdata->imc.e_im_setup_exec), NULL, NULL, NULL); e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata); cfdata->gui.e_im_setup_exec = o; e_widget_frametable_object_append(ol, o, 1, 2, 1, 1, 1, 1, 1, 0); @@ -932,21 +932,21 @@ o = e_widget_label_add(evas, "GTK_IM_MODULE"); e_widget_frametable_object_append(ol, o, 0, 0, 1, 1, 1, 1, 0, 0); - o = e_widget_entry_add(evas, &(cfdata->imc.gtk_im_module)); + o = e_widget_entry_add(evas, &(cfdata->imc.gtk_im_module), NULL, NULL, NULL); e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata); cfdata->gui.gtk_im_module = o; e_widget_frametable_object_append(ol, o, 1, 0, 1, 1, 1, 1, 1, 0); o = e_widget_label_add(evas, "QT_IM_MODULE"); e_widget_frametable_object_append(ol, o, 0, 1, 1, 1, 1, 1, 0, 0); - o = e_widget_entry_add(evas, &(cfdata->imc.qt_im_module)); + o = e_widget_entry_add(evas, &(cfdata->imc.qt_im_module), NULL, NULL, NULL); e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata); cfdata->gui.qt_im_module = o; e_widget_frametable_object_append(ol, o, 1, 1, 1, 1, 1, 1, 1, 0); o = e_widget_label_add(evas, "XMODIFIERS"); e_widget_frametable_object_append(ol, o, 0, 2, 1, 1, 1, 1, 0, 0); - o = e_widget_entry_add(evas, &(cfdata->imc.xmodifiers)); + o = e_widget_entry_add(evas, &(cfdata->imc.xmodifiers), NULL, NULL, NULL); e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata); cfdata->gui.xmodifiers = o; e_widget_frametable_object_append(ol, o, 1, 2, 1, 1, 1, 1, 1, 0); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:18
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_mousebindings Modified Files: e_int_config_mousebindings.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_mousebindings/e_int_config_mousebindings.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_mousebindings.c 13 Sep 2007 21:13:39 -0000 1.2 +++ e_int_config_mousebindings.c 7 Oct 2007 21:22:41 -0000 1.3 @@ -326,7 +326,7 @@ e_widget_table_object_append(ot, of, 0, 0, 3, 1, 1, 1, 1, 1); of = e_widget_framelist_add(evas, _("Action Params"), 0); - ob = e_widget_entry_add(evas, &(cfdata->locals.params)); + ob = e_widget_entry_add(evas, &(cfdata->locals.params), NULL, NULL, NULL); e_widget_disabled_set(ob, 1); cfdata->gui.o_params = ob; e_widget_framelist_object_append(of, ob); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:18
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: e_int_config_profiles.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_int_config_profiles.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_int_config_profiles.c 26 Aug 2007 21:41:20 -0000 1.5 +++ e_int_config_profiles.c 7 Oct 2007 21:22:41 -0000 1.6 @@ -266,7 +266,7 @@ e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 0, 1, 0, 0); - ob = e_widget_entry_add(evas, &(cfdata->new_profile)); + ob = e_widget_entry_add(evas, &(cfdata->new_profile), NULL, NULL, NULL); e_widget_min_size_set(ob, 100, 1); e_widget_table_object_append(ot, ob, 1, 0, 1, 1, |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:18
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_exebuf Modified Files: e_int_config_exebuf.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_exebuf/e_int_config_exebuf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_exebuf.c 22 Aug 2007 10:23:53 -0000 1.2 +++ e_int_config_exebuf.c 7 Oct 2007 21:22:40 -0000 1.3 @@ -186,7 +186,7 @@ of = e_widget_framelist_add(evas, _("Terminal Settings"), 0); ob = e_widget_label_add(evas, _("Terminal Command (CTRL+RETURN to utilize)")); e_widget_framelist_object_append(of, ob); - ob = e_widget_entry_add(evas, &(cfdata->term_cmd)); + ob = e_widget_entry_add(evas, &(cfdata->term_cmd), NULL, NULL, NULL); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:18
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_desklock Modified Files: e_int_config_desklock.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_desklock/e_int_config_desklock.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_desklock.c 28 Jul 2007 03:50:14 -0000 1.1 +++ e_int_config_desklock.c 7 Oct 2007 21:22:40 -0000 1.2 @@ -329,7 +329,7 @@ ow = e_widget_check_add(evas, _("Use custom screenlock"), &(cfdata->custom_lock)); e_widget_framelist_object_append(of, ow); - ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd)); + ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd), NULL, NULL, NULL); e_widget_framelist_object_append(of, ow); e_widget_table_object_append(mt, of, 1, 2, 2, 1, 1, 1, 1, 1); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:18
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c e_entry_dialog.c e_fm_prop.c e_int_border_prop.c e_widget_csel.c e_widget_entry.c e_widget_entry.h e_widget_fsel.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- e_eap_editor.c 19 Aug 2007 14:54:55 -0000 1.89 +++ e_eap_editor.c 7 Oct 2007 21:22:40 -0000 1.90 @@ -463,7 +463,7 @@ 0, 0, 1, 1, 1, 1, 1, 1); - entry = e_widget_entry_add(evas, &(cfdata->name)); + entry = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL); e_widget_min_size_set(entry, 100, 1); e_widget_frametable_object_append(o, entry, 1, 0, 1, 1, @@ -471,7 +471,7 @@ e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")), 0, 1, 1, 1, 1, 1, 1, 1); - editor->entry_widget = e_widget_entry_add(evas, &(cfdata->exec)); + editor->entry_widget = e_widget_entry_add(evas, &(cfdata->exec), NULL, NULL, NULL); e_widget_frametable_object_append(o, editor->entry_widget, 1, 1, 1, 1, 1, 1, 1, 1); @@ -482,7 +482,7 @@ e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Comment")), 0, 2, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->comment)), + e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->comment), NULL, NULL, NULL), 1, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(ol, o, 1, 0, 1, 1, 1 ,1, 1, 1); @@ -514,7 +514,7 @@ 0, 0, 1, 1, 1, 1, 1, 1); - entry = e_widget_entry_add(evas, &(cfdata->generic_name)); + entry = e_widget_entry_add(evas, &(cfdata->generic_name), NULL, NULL, NULL); e_widget_min_size_set(entry, 100, 1); e_widget_frametable_object_append(o, entry, 1, 0, 1, 1, @@ -523,14 +523,14 @@ 0, 1, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->startup_wm_class)), + e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->startup_wm_class), NULL, NULL, NULL), 1, 1, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Categories")), 0, 2, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->categories)), + e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->categories), NULL, NULL, NULL), 1, 2, 1, 1, 1, 1, 1, 1); @@ -552,7 +552,7 @@ o = e_widget_frametable_add(evas, _("Desktop file"), 0); e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Filename")), 0, 0, 1, 1, 0, 0, 0, 0); - fn = e_widget_entry_add(evas, &(cfdata->editor->desktop->orig_path)); + fn = e_widget_entry_add(evas, &(cfdata->editor->desktop->orig_path), NULL, NULL, NULL); e_widget_frametable_object_append(o, fn, 1, 0, 2, 1, 1, 1, 1, 1); e_widget_disabled_set(fn, 1); e_widget_table_object_append(ol, o, 0, 2, 2, 1, 1 ,1, 1, 1); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_entry_dialog.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_entry_dialog.c 7 Oct 2006 17:04:34 -0000 1.9 +++ e_entry_dialog.c 7 Oct 2007 21:22:40 -0000 1.10 @@ -48,7 +48,7 @@ e_widget_list_object_append(o, ob, 1, 0, 0.5); } - ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text)); + ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text), NULL, NULL, NULL); e_widget_list_object_append(o, ed->entry, 1, 1, 0.5); e_widget_min_size_get(o, &w, &h); e_dialog_content_set(dia, o, w, h); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_prop.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_fm_prop.c 29 May 2007 11:25:54 -0000 1.20 +++ e_fm_prop.c 7 Oct 2007 21:22:40 -0000 1.21 @@ -337,28 +337,28 @@ ob = e_widget_label_add(evas, _("File:")); e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0); - ob = e_widget_entry_add(evas, &(cfdata->file)); + ob = e_widget_entry_add(evas, &(cfdata->file), NULL, NULL, NULL); e_widget_min_size_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, _("Size:")); e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0); - ob = e_widget_entry_add(evas, &(cfdata->size)); + ob = e_widget_entry_add(evas, &(cfdata->size), NULL, NULL, NULL); e_widget_min_size_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, _("Last Modified:")); e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0); - ob = e_widget_entry_add(evas, &(cfdata->mod_date)); + ob = e_widget_entry_add(evas, &(cfdata->mod_date), NULL, NULL, NULL); e_widget_min_size_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, _("File Type:")); e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0); - ob = e_widget_entry_add(evas, &(cfdata->mime)); + ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL); e_widget_min_size_set(ob, 140, -1); e_widget_entry_readonly_set(ob, 1); e_widget_table_object_append(ot, ob, 1, 3, 1, 1, 1, 0, 1, 0); @@ -366,7 +366,7 @@ of = e_widget_frametable_add(evas, _("Permissions"), 0); ob = e_widget_label_add(evas, _("Owner:")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_entry_add(evas, &(cfdata->owner)); + ob = e_widget_entry_add(evas, &(cfdata->owner), NULL, NULL, NULL); e_widget_min_size_set(ob, 60, -1); e_widget_entry_readonly_set(ob, 1); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); @@ -455,7 +455,7 @@ { ot = e_widget_frametable_add(evas, _("Link Information"), 0); - ob = e_widget_entry_add(evas, &(cfdata->link)); + ob = e_widget_entry_add(evas, &(cfdata->link), NULL, NULL, NULL); e_widget_frametable_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0); e_widget_table_object_append(o, ot, 1, 1, 1, 1, 1, 1, 1, 1); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_prop.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_int_border_prop.c 13 Sep 2007 21:09:12 -0000 1.13 +++ e_int_border_prop.c 7 Oct 2007 21:22:40 -0000 1.14 @@ -384,7 +384,7 @@ ob = e_widget_label_add(evas, label); \ if (!cfdata->val) e_widget_disabled_set(ob, 1); \ e_widget_frametable_object_append(of, ob, x, y, 1, 1, 1, 1, 1, 1); \ - ob = e_widget_entry_add(evas, &(cfdata->val)); \ + ob = e_widget_entry_add(evas, &(cfdata->val), NULL, NULL, NULL); \ if (!cfdata->val) e_widget_disabled_set(ob, 1); \ e_widget_entry_readonly_set(ob, 1); \ e_widget_min_size_get(ob, &mw, &mh); \ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_csel.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_widget_csel.c 8 Apr 2007 21:00:30 -0000 1.11 +++ e_widget_csel.c 7 Oct 2007 21:22:40 -0000 1.12 @@ -242,7 +242,7 @@ e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd); e_widget_table_object_append(frame, o, 1, i, 1, 1, 1, 1, 1, 0); - o = e_widget_entry_add(evas, &(wd->values[i])); + o = e_widget_entry_add(evas, &(wd->values[i]), NULL, NULL, NULL); e_widget_sub_object_add(obj, o); evas_object_show(o); wd->entries = evas_list_append(wd->entries, o); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_widget_entry.c 14 Aug 2007 21:07:10 -0000 1.20 +++ e_widget_entry.c 7 Oct 2007 21:22:40 -0000 1.21 @@ -8,6 +8,9 @@ { Evas_Object *o_entry; char **text_location; + void (*func) (void *data, void *data2); + void *data; + void *data2; }; /* local subsystem functions */ @@ -30,9 +33,9 @@ * The current value will be used to initialize the entry * @return Returns the new entry widget */ -EAPI Evas_Object * -e_widget_entry_add(Evas *evas, char **text_location) -{ +EAPI Evas_Object +*e_widget_entry_add(Evas *evas, char **text_location, void (*func) (void *data, void *data2), void *data, void *data2) +{ Evas_Object *obj, *o; E_Widget_Data *wd; Evas_Coord minw, minh; @@ -63,6 +66,9 @@ e_entry_min_size_get(o, &minw, &minh); e_widget_min_size_set(obj, minw, minh); + wd->func = func; + wd->data = data; + wd->data2 = data2; evas_object_smart_callback_add(o, "changed", _e_wid_changed_cb, obj); return obj; @@ -252,8 +258,9 @@ free(*wd->text_location); *wd->text_location = text ? strdup(text) : NULL; } - e_widget_change(data); + + if (wd->func) wd->func(wd->data, wd->data2); } static void =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_widget_entry.h 10 Jan 2007 16:32:29 -0000 1.8 +++ e_widget_entry.h 7 Oct 2007 21:22:40 -0000 1.9 @@ -6,7 +6,7 @@ #ifndef E_WIDGET_ENTRY_H #define E_WIDGET_ENTRY_H -EAPI Evas_Object *e_widget_entry_add (Evas *evas, char **text_location); +EAPI Evas_Object *e_widget_entry_add (Evas *evas, char **text_location, void (*func) (void *data, void *data2), void *data, void *data2); EAPI void e_widget_entry_text_set (Evas_Object *entry, const char *text); EAPI const char *e_widget_entry_text_get (Evas_Object *entry); EAPI void e_widget_entry_clear (Evas_Object *entry); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- e_widget_fsel.c 25 Jul 2007 17:00:50 -0000 1.54 +++ e_widget_fsel.c 7 Oct 2007 21:22:40 -0000 1.55 @@ -327,7 +327,7 @@ wd->o_preview_size, 0, 0, 1, 1, 1, 1, 1, 1); - o = e_widget_entry_add(evas, &(wd->preview_size_text)); + o = e_widget_entry_add(evas, &(wd->preview_size_text), NULL, NULL, NULL); e_widget_entry_readonly_set(o, 1); wd->o_preview_size_entry = o; e_widget_sub_object_add(obj, o); @@ -343,7 +343,7 @@ wd->o_preview_owner, 0, 1, 1, 1, 1, 1, 1, 1); - o = e_widget_entry_add(evas, &(wd->preview_owner_text)); + o = e_widget_entry_add(evas, &(wd->preview_owner_text), NULL, NULL, NULL); e_widget_entry_readonly_set(o, 1); wd->o_preview_owner_entry = o; e_widget_sub_object_add(obj, o); @@ -359,7 +359,7 @@ wd->o_preview_perms, 0, 2, 1, 1, 1, 1, 1, 1); - o = e_widget_entry_add(evas, &(wd->preview_perms_text)); + o = e_widget_entry_add(evas, &(wd->preview_perms_text), NULL, NULL, NULL); e_widget_entry_readonly_set(o, 1); wd->o_preview_perms_entry = o; e_widget_sub_object_add(obj, o); @@ -375,7 +375,7 @@ wd->o_preview_time, 0, 3, 1, 1, 1, 1, 1, 1); - o = e_widget_entry_add(evas, &(wd->preview_time_text)); + o = e_widget_entry_add(evas, &(wd->preview_time_text), NULL, NULL, NULL); e_widget_entry_readonly_set(o, 1); wd->o_preview_time_entry = o; e_widget_sub_object_add(obj, o); @@ -469,7 +469,7 @@ e_widget_min_size_set(o, 128, 128); e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 1, 1); - o = e_widget_entry_add(evas, &(wd->entry_text)); + o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL); wd->o_entry = o; e_widget_sub_object_add(obj, o); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:18
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_mime Modified Files: e_int_config_mime_edit.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_mime/e_int_config_mime_edit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_mime_edit.c 13 Aug 2007 00:07:05 -0000 1.3 +++ e_int_config_mime_edit.c 7 Oct 2007 21:22:41 -0000 1.4 @@ -136,7 +136,7 @@ of = e_widget_frametable_add(evas, _("Basic Info"), 0); ob = e_widget_label_add(evas, _("Mime:")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_entry_add(evas, &(cfdata->mime)); + ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL); e_widget_entry_readonly_set(ob, 1); e_widget_min_size_set(ob, 100, 1); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); |
From: Enlightenment C. <no...@cv...> - 2007-10-07 21:23:19
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_desk Modified Files: e_int_config_desk.c Log Message: API breakage: e_widget_entry_add() allows now to set a cb function for text change events. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_desk/e_int_config_desk.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_desk.c 28 Jul 2007 03:50:14 -0000 1.1 +++ e_int_config_desk.c 7 Oct 2007 21:22:40 -0000 1.2 @@ -149,7 +149,7 @@ of = e_widget_frametable_add(evas, _("Desktop Name"), 0); ob = e_widget_label_add(evas, _("Name:")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 0); - ob = e_widget_entry_add(evas, &(cfdata->name)); + ob = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL); e_widget_frametable_object_append(of, ob, 1, 0, 2, 1, 1, 1, 1, 0); e_widget_list_object_append(o, of, 1, 1, 0.5); |