Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_ilist.c e_int_config_modules.c
Log Message:
E_Ilist
- Remove tons of nasty whitespace.
- Initialize some list vars to NULL before use.
- Reduce some 2 line checks (x = data; if !x return) into single line.
- When setting an ilist item to selectable via API,
check that the item is not a header as these are not selectable
currently.
- Add some NBs for if/when headers do become selectable.
Modules Dialog:
- Initialize some list vars to NULL before use.
- Reduce some 2 line checks (x = data; if !x return) into single line.
- When loading/unload module(s), attempt to reselect the next item in
the list(s).
sshh...I wasn't here ;)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_ilist.c 23 Jan 2008 09:04:55 -0000 1.40
+++ e_ilist.c 18 Apr 2008 06:23:21 -0000 1.41
@@ -11,8 +11,7 @@
struct _E_Smart_Data
{
Evas_Coord x, y, w, h, iw, ih;
- Evas_Object *o_smart;
- Evas_Object *o_box;
+ Evas_Object *o_smart, *o_box;
Evas_List *items;
int selected;
unsigned char selector : 1;
@@ -49,12 +48,12 @@
{
E_Ilist_Item *si;
Evas_Coord mw = 0, mh = 0;
-
+
API_ENTRY return;
si = E_NEW(E_Ilist_Item, 1);
si->sd = sd;
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-
+
if (header)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_header");
@@ -79,14 +78,14 @@
si->data2 = data2;
si->header = header;
sd->items = evas_list_append(sd->items, si);
-
+
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
e_box_pack_end(sd->o_box, si->o_base);
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
mw, mh, 99999, 99999);
e_box_thaw(sd->o_box);
-
+
evas_object_lower(sd->o_box);
evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
_e_smart_event_mouse_down, si);
@@ -100,12 +99,12 @@
{
E_Ilist_Item *si, *ri;
Evas_Coord mw = 0, mh = 0;
-
+
API_ENTRY return;
si = E_NEW(E_Ilist_Item, 1);
si->sd = sd;
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-
+
if (header)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_header");
@@ -129,13 +128,13 @@
si->data = data;
si->data2 = data2;
si->header = header;
-
+
ri = evas_list_nth(sd->items, relative);
if (ri)
sd->items = evas_list_append_relative(sd->items, si, ri);
else
sd->items = evas_list_append(sd->items, si);
-
+
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
if (ri)
@@ -145,7 +144,7 @@
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
mw, mh, 99999, 99999);
e_box_thaw(sd->o_box);
-
+
evas_object_lower(sd->o_box);
evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
_e_smart_event_mouse_down, si);
@@ -159,12 +158,12 @@
{
E_Ilist_Item *si;
Evas_Coord mw = 0, mh = 0;
-
+
API_ENTRY return;
si = E_NEW(E_Ilist_Item, 1);
si->sd = sd;
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-
+
if (header)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_header");
@@ -189,14 +188,14 @@
si->data2 = data2;
si->header = header;
sd->items = evas_list_prepend(sd->items, si);
-
+
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
e_box_pack_start(sd->o_box, si->o_base);
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
mw, mh, 99999, 99999);
e_box_thaw(sd->o_box);
-
+
evas_object_lower(sd->o_box);
evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
_e_smart_event_mouse_down, si);
@@ -210,12 +209,12 @@
{
E_Ilist_Item *si, *ri;
Evas_Coord mw = 0, mh = 0;
-
+
API_ENTRY return;
si = E_NEW(E_Ilist_Item, 1);
si->sd = sd;
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-
+
if (header)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_header");
@@ -239,13 +238,13 @@
si->data = data;
si->data2 = data2;
si->header = header;
-
+
ri = evas_list_nth(sd->items, relative);
if (ri)
sd->items = evas_list_prepend_relative(sd->items, si, ri);
else
sd->items = evas_list_prepend(sd->items, si);
-
+
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
if (ri)
@@ -255,7 +254,7 @@
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
mw, mh, 99999, 99999);
e_box_thaw(sd->o_box);
-
+
evas_object_lower(sd->o_box);
evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
_e_smart_event_mouse_down, si);
@@ -268,12 +267,13 @@
e_ilist_clear(Evas_Object *obj)
{
API_ENTRY return;
+
e_ilist_freeze(obj);
while (sd->items)
{
- E_Ilist_Item *si;
-
- si = sd->items->data;
+ E_Ilist_Item *si = NULL;
+
+ if (!(si = sd->items->data)) continue;
sd->items = evas_list_remove_list(sd->items, sd->items);
if (si->o_icon) evas_object_del(si->o_icon);
evas_object_del(si->o_base);
@@ -342,17 +342,17 @@
EAPI void
e_ilist_unselect(Evas_Object *obj)
{
- Evas_List *l;
-
+ Evas_List *l = NULL;
+
API_ENTRY return;
+
if (!sd->items) return;
if (sd->selected < 0) return;
for (l = sd->items; l; l = l->next)
{
- E_Ilist_Item *si;
-
- si = l->data;
- if (!si) continue;
+ E_Ilist_Item *si = NULL;
+
+ if (!(si = l->data)) continue;
if (!si->selected) continue;
edje_object_signal_emit(si->o_base, "e,state,unselected", "e");
si->selected = 0;
@@ -363,28 +363,30 @@
EAPI void
e_ilist_selected_set(Evas_Object *obj, int n)
{
- E_Ilist_Item *si;
- Evas_List *l;
+ E_Ilist_Item *si = NULL;
+ Evas_List *l = NULL;
int i;
-
+
API_ENTRY return;
if (!sd->items) return;
-
+
i = evas_list_count(sd->items);
if (n >= i) n = i - 1;
else if (n < 0) n = 0;
for (l = sd->items; l; l = l->next)
{
- si = l->data;
- if (!si) continue;
- if (!si->selected) continue;
+ if (!(si = l->data)) continue;
+ if ((!si->selected) || (si->header)) continue;
edje_object_signal_emit(si->o_base, "e,state,unselected", "e");
si->selected = 0;
}
sd->selected = -1;
- si = evas_list_nth(sd->items, n);
- if (!si) return;
+ if (!(si = evas_list_nth(sd->items, n))) return;
+
+ /* NB: Remove this if headers ever become selectable */
+ if (si->header) return;
+
si->selected = 1;
sd->selected = n;
evas_object_raise(si->o_base);
@@ -400,9 +402,9 @@
EAPI int
e_ilist_selected_get(Evas_Object *obj)
{
- Evas_List *l;
+ Evas_List *l = NULL;
int i, j;
-
+
API_ENTRY return -1;
if (!sd->items) return -1;
if (!sd->multi_select)
@@ -412,10 +414,9 @@
j = -1;
for (i = 0, l = sd->items; l; l = l->next, i++)
{
- E_Ilist_Item *li;
-
- li = l->data;
- if (!li) continue;
+ E_Ilist_Item *li = NULL;
+
+ if (!(li = l->data)) continue;
if (li->selected) j = i;
}
return j;
@@ -425,8 +426,8 @@
EAPI const char *
e_ilist_selected_label_get(Evas_Object *obj)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return NULL;
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
@@ -439,8 +440,8 @@
EAPI void *
e_ilist_selected_data_get(Evas_Object *obj)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return NULL;
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
@@ -453,8 +454,8 @@
EAPI void *
e_ilist_selected_data2_get(Evas_Object *obj)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return NULL;
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
@@ -467,8 +468,8 @@
EAPI Evas_Object *
e_ilist_selected_icon_get(Evas_Object *obj)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return NULL;
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
@@ -481,13 +482,12 @@
EAPI void
e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y,
Evas_Coord *w, Evas_Coord *h)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return;
if (!sd->items) return;
if (sd->selected < 0) return;
- si = evas_list_nth(sd->items, sd->selected);
- if (!si) return;
+ if (!(si = evas_list_nth(sd->items, sd->selected))) return;
evas_object_geometry_get(si->o_base, x, y, w, h);
*x -= sd->x;
*y -= sd->y;
@@ -498,15 +498,14 @@
{
Evas_List *l = NULL;
int count = 0;
-
+
API_ENTRY return 0;
if (!sd->items) return 0;
for (l = sd->items; l; l = l->next)
{
- E_Ilist_Item *si;
-
- si = l->data;
- if (!si) continue;
+ E_Ilist_Item *si = NULL;
+
+ if (!(si = l->data)) continue;
if (si->selected) count++;
}
return count;
@@ -515,12 +514,11 @@
EAPI void
e_ilist_remove_num(Evas_Object *obj, int n)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return;
if (!sd->items) return;
- si = evas_list_nth(sd->items, n);
- if (!si) return;
+ if (!(si = evas_list_nth(sd->items, n))) return;
sd->items = evas_list_remove(sd->items, si);
if (sd->selected == n) sd->selected = -1;
if (si->o_icon) evas_object_del(si->o_icon);
@@ -531,8 +529,8 @@
EAPI const char *
e_ilist_nth_label_get(Evas_Object *obj, int n)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, n);
@@ -543,11 +541,13 @@
EAPI void
e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
+ /* check for a NULL label first...simplier, faster check then doing
+ * API_ENTRY check first */
+ if (!label) return;
API_ENTRY return;
if (!sd->items) return;
- if (!label) return;
si = evas_list_nth(sd->items, n);
if (si) edje_object_part_text_set(si->o_base, "e.text.label", label);
}
@@ -555,8 +555,8 @@
EAPI Evas_Object *
e_ilist_nth_icon_get(Evas_Object *obj, int n)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, n);
@@ -567,12 +567,11 @@
EAPI void
e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return;
if (!sd->items) return;
- si = evas_list_nth(sd->items, n);
- if (!si) return;
+ if (!(si = evas_list_nth(sd->items, n))) return;
if (si->o_icon)
{
edje_object_part_unswallow(si->o_base, si->o_icon);
@@ -590,8 +589,8 @@
EAPI int
e_ilist_nth_is_header(Evas_Object *obj, int n)
{
- E_Ilist_Item *si;
-
+ E_Ilist_Item *si = NULL;
+
API_ENTRY return 0;
if (!sd->items) return 0;
si = evas_list_nth(sd->items, n);
@@ -602,14 +601,11 @@
EAPI void
e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord
*y, Evas_Coord *w, Evas_Coord *h)
{
- E_Ilist_Item *si;
+ E_Ilist_Item *si = NULL;
API_ENTRY return;
if (!sd->items) return;
-
- si = evas_list_nth(sd->items, n);
- if (!si) return;
-
+ if (!(si = evas_list_nth(sd->items, n))) return;
evas_object_geometry_get(si->o_base, x, y, w, h);
*x -= sd->x;
*y -= sd->y;
@@ -618,19 +614,18 @@
EAPI void
e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
- Evas_List *l;
-
+ Evas_List *l = NULL;
+
API_ENTRY return;
if ((sd->iw == w) && (sd->ih == h)) return;
sd->iw = w;
sd->ih = h;
for (l = sd->items; l; l = l->next)
{
- E_Ilist_Item *si;
+ E_Ilist_Item *si = NULL;
Evas_Coord mw = 0, mh = 0;
-
- si = l->data;
- if (!si) continue;
+
+ if (!(si = l->data)) continue;
if (!si->o_icon) continue;
edje_extern_object_min_size_set(si->o_icon, w, h);
edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon);
@@ -650,19 +645,18 @@
EAPI void
e_ilist_multi_select(Evas_Object *obj, int n)
{
- E_Ilist_Item *si;
+ E_Ilist_Item *si = NULL;
int i;
-
+
API_ENTRY return;
if (!sd->items) return;
if (!sd->multi_select) return;
-
+
i = evas_list_count(sd->items);
if (n >= i) n = i - 1;
else if (n < 0) n = 0;
-
- si = evas_list_nth(sd->items, n);
- if (!si) return;
+
+ if (!(si = evas_list_nth(sd->items, n))) return;
sd->selected = n;
if (si->selected)
{
@@ -690,22 +684,21 @@
EAPI void
e_ilist_range_select(Evas_Object *obj, int n)
{
- E_Ilist_Item *si;
+ E_Ilist_Item *si = NULL;
int i, j, dir;
-
+
API_ENTRY return;
if (!sd->items) return;
if (!sd->multi_select) return;
-
+
i = evas_list_count(sd->items);
if (n >= i) n = i - 1;
else if (n < 0) n = 0;
if (n < sd->selected) dir = 0;
else dir = 1;
-
- si = evas_list_nth(sd->items, n);
- if (!si) return;
+
+ if (!(si = evas_list_nth(sd->items, n))) return;
if (dir == 1)
{
for (j = (sd->selected + 1); ((j < i) && (j <= n)); j++)
@@ -747,17 +740,17 @@
_e_smart_add(Evas_Object *obj)
{
E_Smart_Data *sd;
-
+
sd = calloc(1, sizeof(E_Smart_Data));
if (!sd) return;
evas_object_smart_data_set(obj, sd);
-
+
sd->o_smart = obj;
sd->x = sd->y = sd->w = sd->h = 0;
sd->iw = sd->ih = 24;
sd->selected = -1;
sd->multi_select = 0;
-
+
sd->o_box = e_box_add(evas_object_evas_get(obj));
e_box_align_set(sd->o_box, 0.0, 0.0);
e_box_homogenous_set(sd->o_box, 0);
@@ -844,17 +837,19 @@
E_Smart_Data *sd;
Evas_Event_Mouse_Down *ev;
E_Ilist_Item *si;
- Evas_List *l;
+ Evas_List *l = NULL;
int i;
ev = event_info;
si = data;
sd = si->sd;
-
+
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
else sd->on_hold = 0;
-
+
+ /* NB: Remove if headers ever become selectable */
if (si->header) return;
+
if (!sd->items) return;
for (i = 0, l = sd->items; l; l = l->next, i++)
{
@@ -874,7 +869,7 @@
break;
}
}
-
+
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
evas_object_smart_callback_call(sd->o_smart, "selected", NULL);
}
@@ -892,12 +887,13 @@
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
else sd->on_hold = 0;
-
+
+ /* NB: Remove if headers ever become selectable */
if (si->header) return;
+
if (!sd->items) return;
if (!sd->selector) return;
- si = evas_list_nth(sd->items, sd->selected);
- if (!si) return;
+ if (!(si = evas_list_nth(sd->items, sd->selected))) return;
if (sd->on_hold)
{
sd->on_hold = 0;
@@ -913,14 +909,14 @@
E_Smart_Data *sd;
E_Ilist_Item *si;
int n, ns;
-
+
sd = data;
ev = event_info;
ns = sd->selected;
-
+
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
else sd->on_hold = 0;
-
+
if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")))
{
n = ns;
@@ -931,7 +927,7 @@
n = ns;
break;
}
- -- n;
+ --n;
si = evas_list_nth(sd->items, n);
}
while ((si) && (si->header));
@@ -957,7 +953,7 @@
n = ns;
break;
}
- ++ n;
+ ++n;
si = evas_list_nth(sd->items, n);
}
while ((si) && (si->header));
@@ -983,7 +979,7 @@
n = ns;
break;
}
- ++ n;
+ ++n;
si = evas_list_nth(sd->items, n);
}
while ((si) && (si->header));
@@ -1009,7 +1005,7 @@
n = ns;
break;
}
- -- n;
+ --n;
si = evas_list_nth(sd->items, n);
}
while ((si) && (si->header));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- e_int_config_modules.c 9 Feb 2008 22:41:30 -0000 1.83
+++ e_int_config_modules.c 18 Apr 2008 06:23:21 -0000 1.84
@@ -34,7 +34,8 @@
/* Key pairs for module types
*
- * Should be in alphabetic order */
+ * Should be in alphabetic order
+*/
const CFTypes _types[] =
{
{"appearance", N_("Appearance")},
@@ -119,6 +120,7 @@
cfdata = E_NEW(E_Config_Dialog_Data, 1);
if (!cfdata) return NULL;
+
_fill_data(cfdata);
return cfdata;
}
@@ -136,8 +138,7 @@
{
E_Path_Dir *epd = NULL;
- epd = l->data;
- if (!epd) continue;
+ if (!(epd = l->data)) continue;
if (!ecore_file_is_dir(epd->dir)) continue;
_load_modules(epd->dir);
}
@@ -229,8 +230,7 @@
char *mod = NULL;
if (!dir) return;
- files = ecore_file_ls(dir);
- if (!files) return;
+ if (!(files = ecore_file_ls(dir))) return;
/* get all modules in this path_dir */
ecore_list_first_goto(files);
@@ -245,8 +245,7 @@
/* check that we have a desktop file for this module */
snprintf(buf, sizeof(buf), "%s/%s/module.desktop", dir, mod);
if (!ecore_file_exists(buf)) continue;
- desk = efreet_desktop_get(buf);
- if (!desk) continue;
+ if (!(desk = efreet_desktop_get(buf))) continue;
/* does the ModuleType exist in desktop? */
if (desk->x)
@@ -308,8 +307,7 @@
int count = 0;
if (!_types[i].key) continue;
- cft = evas_hash_find(types_hash, _types[i].key);
- if (!cft) continue;
+ if (!(cft = evas_hash_find(types_hash, _types[i].key))) continue;
if (cft->modules)
{
if (!enabled)
@@ -324,6 +322,7 @@
if (l) evas_list_free(l);
continue;
}
+
/* We have at least one, append header */
e_widget_ilist_header_append(obj, NULL, cft->name);
@@ -351,8 +350,7 @@
{
CFType *type = NULL;
- type = data;
- if (!type) return 1;
+ if (!(type = data)) return 1;
if (type->key) evas_stringshare_del(type->key);
if (type->name) evas_stringshare_del(type->name);
if (type->modules)
@@ -371,8 +369,7 @@
{
CFModule *mod = NULL;
- mod = data;
- if (!mod) return 1;
+ if (!(mod = data)) return 1;
if (mod->short_name) evas_stringshare_del(mod->short_name);
if (mod->name) evas_stringshare_del(mod->name);
if (mod->icon) evas_stringshare_del(mod->icon);
@@ -436,8 +433,7 @@
char *path;
char buf[4096];
- mod = ml->data;
- if (!mod) continue;
+ if (!(mod = ml->data)) continue;
if (mod->orig_path)
{
path = ecore_file_dir_get(mod->orig_path);
@@ -458,8 +454,7 @@
{
E_Config_Dialog_Data *cfdata = NULL;
- cfdata = data;
- if (!cfdata) return;
+ if (!(cfdata = data)) return;
/* Unselect all in loaded list & disable buttons */
e_widget_ilist_unselect(cfdata->l_loaded);
@@ -484,8 +479,7 @@
{
E_Config_Dialog_Data *cfdata = NULL;
- cfdata = data;
- if (!cfdata) return;
+ if (!(cfdata = data)) return;
/* Unselect all in avail list & disable button */
e_widget_ilist_unselect(cfdata->l_avail);
@@ -530,8 +524,7 @@
{
CFModule *mod = NULL;
- mod = data;
- if (!mod) return 1;
+ if (!(mod = data)) return 1;
mod->selected = 0;
return 1;
}
@@ -543,8 +536,7 @@
E_Config_Dialog_Data *cfdata = NULL;
int i = 0;
- cfdata = data;
- if (!cfdata) return;
+ if (!(cfdata = data)) return;
for (i = 0, l = e_widget_ilist_items_get(obj); l; l = l->next, i++)
{
E_Ilist_Item *item = NULL;
@@ -552,8 +544,7 @@
item = l->data;
if ((!item) || (!item->selected)) continue;
- mod = e_widget_ilist_nth_data_get(obj, i);
- if (!mod) continue;
+ if (!(mod = e_widget_ilist_nth_data_get(obj, i))) continue;
mod->selected = 1;
if (mod->comment)
e_widget_textblock_markup_set(cfdata->o_desc, mod->comment);
@@ -568,30 +559,50 @@
_btn_cb_unload(void *data, void *data2)
{
E_Config_Dialog_Data *cfdata = NULL;
+ int sel = -1;
- cfdata = data;
- if (!cfdata) return;
+ if (!(cfdata = data)) return;
+
+ /* get what is currently selected in the list */
+ sel = e_widget_ilist_selected_get(cfdata->l_loaded);
_enable_modules(0);
e_widget_disabled_set(cfdata->b_unload, 1);
e_widget_textblock_markup_set(cfdata->o_desc, _("Description:
Unavailable"));
+
+ /* using a total reload here as it's simpler than parsing the list(s),
+ * finding what was selected, removing it, checking for headers, etc */
_fill_list(cfdata->l_avail, 0);
_fill_list(cfdata->l_loaded, 1);
+
+ /* move the selection down one if possible. Ilist itself will check
+ * for headers, etc, etc */
+ e_widget_ilist_selected_set(cfdata->l_loaded, sel);
}
static void
_btn_cb_load(void *data, void *data2)
{
E_Config_Dialog_Data *cfdata = NULL;
+ int sel = -1;
- cfdata = data;
- if (!cfdata) return;
+ if (!(cfdata = data)) return;
+
+ /* get what is currently selected in the list */
+ sel = e_widget_ilist_selected_get(cfdata->l_avail);
_enable_modules(1);
e_widget_disabled_set(cfdata->b_load, 1);
e_widget_textblock_markup_set(cfdata->o_desc, _("Description:
Unavailable"));
+
+ /* using a total reload here as it's simpler than parsing the list(s),
+ * finding what was selected, removing it, checking for headers, etc */
_fill_list(cfdata->l_avail, 0);
_fill_list(cfdata->l_loaded, 1);
+
+ /* move the selection down one if possible. Ilist itself will check
+ * for headers, etc, etc */
+ e_widget_ilist_selected_set(cfdata->l_avail, sel);
}
static void
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
