Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_configure.c e_ilist.c e_ilist.h e_int_config_background.c
e_maximize.c e_widget_ilist.c e_widget_ilist.h
Removed Files:
e_int_config_general.c e_int_config_general.h
Log Message:
Add some functions to e_ilist and e_widget_ilist.c . Fix commented
unused variables (just removed them). Added Cursor Settings and Startup
Settings dialogue. Removed General Settings dialog.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_configure.c 7 Jan 2006 22:33:03 -0000 1.30
+++ e_configure.c 25 Jan 2006 04:06:51 -0000 1.31
@@ -65,11 +65,12 @@
e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background
Settings"), e_int_config_background);
e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme
Selector"), e_int_config_theme);
e_configure_standard_item_add(eco, "enlightenment/modules", _("Module
Settings"), e_int_config_modules);
- e_configure_standard_item_add(eco, "enlightenment/e", _("General
Settings"), e_int_config_general);
+ e_configure_standard_item_add(eco, "enlightenment/mouse", _("Cursor
Settings"), e_int_config_cursor);
e_configure_standard_item_add(eco, "enlightenment/desktops", _("Desktop
Settings"), e_int_config_desks);
e_configure_standard_item_add(eco, "enlightenment/e", _("Focus Settings"),
e_int_config_focus);
e_configure_standard_item_add(eco, "enlightenment/favorites", _("Menu
Settings"), e_int_config_menus);
e_configure_standard_item_add(eco, "enlightenment/configuration",
_("Performance Settings"), e_int_config_performance);
+ e_configure_standard_item_add(eco, "enlightenment/run", _("Startup
Settings"), e_int_config_startup);
e_configure_standard_item_add(eco, "enlightenment/windows", _("Window List
Settings"), e_int_config_winlist);
e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Display Settings"), e_int_config_window_display);
e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Manipulation Settings"), e_int_config_window_manipulation);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ilist.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_ilist.c 23 Jan 2006 18:47:10 -0000 1.13
+++ e_ilist.c 25 Jan 2006 04:06:51 -0000 1.14
@@ -296,6 +296,21 @@
return evas_list_count(sd->items);
}
+EAPI void
+e_ilist_clear(Evas_Object *obj)
+{
+ INTERNAL_ENTRY;
+ while (sd->items)
+ {
+ E_Smart_Item *si;
+
+ si = sd->items->data;
+ sd->items = evas_list_remove_list(sd->items, sd->items);
+ if (si->icon_obj) evas_object_del(si->icon_obj);
+ evas_object_del(si->base_obj);
+ free(si);
+ }
+}
/* local subsystem functions */
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ilist.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_ilist.h 23 Jan 2006 18:47:10 -0000 1.7
+++ e_ilist.h 25 Jan 2006 04:06:51 -0000 1.8
@@ -21,6 +21,7 @@
EAPI void e_ilist_remove_num (Evas_Object *obj, int n);
EAPI void e_ilist_remove_label (Evas_Object *obj, char
*label);
EAPI int e_ilist_count (Evas_Object *obj);
+EAPI void e_ilist_clear (Evas_Object *obj);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_int_config_background.c 23 Jan 2006 04:52:37 -0000 1.35
+++ e_int_config_background.c 25 Jan 2006 04:06:51 -0000 1.36
@@ -455,7 +455,7 @@
ic = e_thumb_generate_begin((char *)path, 48, 48, evas, &ic,
NULL, NULL);
else
ic = e_thumb_evas_object_get((char *)path, evas, 48, 48, 1);
- e_widget_ilist_append(il, ic, ecore_file_strip_ext(file),
_ilist_cb_bg_selected, cfd, (char *)path);
+ e_widget_ilist_append(il, ic, ecore_file_strip_ext(file),
_ilist_cb_bg_selected, cfd, (char *)path);
}
}
free(file);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_maximize.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_maximize.c 24 Jan 2006 03:03:28 -0000 1.7
+++ e_maximize.c 25 Jan 2006 04:06:51 -0000 1.8
@@ -37,14 +37,12 @@
EAPI void
e_maximize_border_gadman_fit(E_Border *bd, int *x1, int *y1, int *x2, int *y2)
{
- /* Unused variables int ii, jj; */
Evas_List *l, *ll;
Evas_List *mzones = NULL;
Evas_List *tmp_mzones = NULL;
struct _m_zone *mzone = NULL;
- /* Unused variable: struct _m_zone *mzone_split; */
mzone = (struct _m_zone *)malloc(sizeof(struct _m_zone));
if (mzone == NULL)
@@ -136,7 +134,6 @@
else if (mzones != NULL && mzones->next != NULL)
{
Evas_List *wl = NULL;
- /* Unused var *hl = NULL; */
/* The use of *_width_reverse_sort or *_height_reverse_sort depends
* on the preferences of the user - what window he/she would like to
@@ -144,7 +141,6 @@
*/
wl = evas_list_sort(mzones, evas_list_count(mzones),
_e_mzone_cb_width_reverse_sort);
mzones = NULL;
- /* hl = evas_list_sort(mzones, -1, _e_mzone_cb_height_reverse_sort); */
mzone = wl->data;
/* mzone = hl->data; */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_ilist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_widget_ilist.c 23 Jan 2006 18:47:10 -0000 1.9
+++ e_widget_ilist.c 25 Jan 2006 04:06:51 -0000 1.10
@@ -161,6 +161,29 @@
return e_ilist_count(wd->o_ilist);
}
+EAPI void
+e_widget_ilist_clear(Evas_Object *obj)
+{
+ E_Widget_Data *wd;
+ int mw, mh, vw, vh, w, h;
+
+ wd = e_widget_data_get(obj);
+ e_ilist_clear(wd->o_ilist);
+
+ e_ilist_min_size_get(wd->o_ilist, &mw, &mh);
+ evas_object_resize(wd->o_ilist, mw, mh);
+ e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
+ evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &w, &h);
+ if (mw > vw)
+ {
+ Evas_Coord wmw, wmh;
+
+ e_widget_min_size_get(obj, &wmw, &wmh);
+ e_widget_min_size_set(obj, mw + (w - vw), wmh);
+ }
+ return;
+}
+
static void
_e_wid_del_hook(Evas_Object *obj)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_ilist.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_widget_ilist.h 23 Jan 2006 18:47:10 -0000 1.5
+++ e_widget_ilist.h 25 Jan 2006 04:06:51 -0000 1.6
@@ -16,6 +16,7 @@
EAPI void e_widget_ilist_remove_num(Evas_Object *obj, int n);
EAPI void e_widget_ilist_remove_label(Evas_Object *obj, char *label);
EAPI int e_widget_ilist_count(Evas_Object *obj);
+EAPI void e_widget_ilist_clear(Evas_Object *obj);
#endif
#endif
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
