E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_color_classes.c Log Message: Added a button to be able to reset colors to their defaults. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_color_classes.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e_int_config_color_classes.c11 Oct 2006 03:53:31 - 1.19 +++ e_int_config_color_classes.c11 Oct 2006 04:51:30 - 1.20 @@ -29,7 +29,7 @@ Evas_List *classes; struct { - Evas_Object *ilist; + Evas_Object *ilist, *button; Evas_Object *renable, *rdisable; Evas_Object *c1, *c2, *c3; } gui; @@ -101,6 +101,7 @@ static void _color1_cb_change (void *data, Evas_Object *obj); static void _color2_cb_change (void *data, Evas_Object *obj); static void _color3_cb_change (void *data, Evas_Object *obj); +static void _button_cb(void *data, void *data2); EAPI E_Config_Dialog * e_int_config_color_classes(E_Container *con) @@ -120,7 +121,7 @@ v->advanced.create_widgets = _adv_create_widgets; cfd = e_config_dialog_new(con, _("Colors"), "E", "_config_color_classes", -"enlightenment/themes", 0, v, NULL); +"enlightenment/colors", 0, v, NULL); return cfd; } @@ -401,7 +402,7 @@ Evas_List *l; o = e_widget_list_add(evas, 0, 0); - ot = e_widget_table_add(evas, 1); + ot = e_widget_table_add(evas, 0); of = e_widget_framelist_add(evas, _("Color Classes"), 0); e_widget_framelist_content_align_set(of, 0.0, 0.0); @@ -412,7 +413,7 @@ e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 0, 1, 4, 1, 1, 1, 1); - of = e_widget_framelist_add(evas, _("Object Color"), 1); + of = e_widget_framelist_add(evas, _("Object Color"), 0); ob = e_widget_color_well_add(evas, cfdata->color1, 1); cfdata->gui.c1 = ob; e_widget_on_change_hook_set(ob, _color1_cb_change, cfdata); @@ -420,7 +421,7 @@ e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1); - of = e_widget_framelist_add(evas, _("Outline Color"), 1); + of = e_widget_framelist_add(evas, _("Outline Color"), 0); ob = e_widget_color_well_add(evas, cfdata->color2, 1); cfdata->gui.c2 = ob; e_widget_on_change_hook_set(ob, _color2_cb_change, cfdata); @@ -428,7 +429,7 @@ e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 1, 2, 1, 1, 1, 1, 1, 1); - of = e_widget_framelist_add(evas, _("Shadow Color"), 1); + of = e_widget_framelist_add(evas, _("Shadow Color"), 0); ob = e_widget_color_well_add(evas, cfdata->color3, 1); cfdata->gui.c3 = ob; e_widget_on_change_hook_set(ob, _color3_cb_change, cfdata); @@ -448,9 +449,13 @@ evas_object_smart_callback_add(ob, "changed", _radio_cb_change, cfdata); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1); + + ob = e_widget_button_add(evas, _("Defaults"), NULL, _button_cb, cfdata, NULL); + cfdata->gui.button = ob; + e_widget_disabled_set(ob, 1); + e_widget_table_object_append(ot, ob, 1, 4, 1, 1, 1, 0, 1, 0); - e_widget_list_object_append(o, ot, 1, 1, 0.5); - e_dialog_resizable_set(cfd->dia, 1); + e_widget_list_object_append(o, ot, 1, 1, 0.5); return o; } @@ -485,7 +490,7 @@ } e_widget_ilist_go(obj); e_widget_min_size_get(obj, &w, &h); - e_widget_min_size_set(obj, w, 275); + e_widget_min_size_set(obj, w, 300); } static void @@ -516,22 +521,7 @@ e_util_edje_icon_set(icon, "enlightenment/e"); } else - { -c->r = 255; -c->g = 255; -c->b = 255; -c->a = 255; -c->r2 = 0; -c->g2 = 0; -c->b2 = 0; -c->a2 = 255; -c->r3 = 0; -c->g3 = 0; -c->b3 = 0; -c->a3 = 255; -icon = NULL; -_update_colors(cfdata, c); - } + icon = NULL; e_widget_ilist_nth_icon_set(cfdata->gui.ilist, n, icon); break; @@ -543,12 +533,14 @@ e_widget_disabled_set(cfdata->gui.c1, 1); e_widget_disabled_set(cfdata->gui.c2, 1); e_widget_disabled_set(cfdata->gui.c3, 1); + e_widget_disabled_set(cfdata->gui.button, 1); } else if (cfdata->state == 1) { e_widget_disabled_set(cfdata->gui.c1, 0); e_widget_disabled_set(cfdata->gui.c2, 0); e_widget_disabled_set(cfdata->gui.c3, 0); + e_widget_disabled_set(cfdata->gui.button, 0); } } @@ -708,5 +700,40 @@ c->a3 = cfdata->color3->a; br
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_paned.h Log Message: - formatting === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_paned.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ewl_paned.h 30 Jun 2006 00:54:39 - 1.19 +++ ewl_paned.h 11 Oct 2006 03:53:31 - 1.20 @@ -39,20 +39,20 @@ */ struct Ewl_Paned { -Ewl_Container container;/**< Inherit from Ewl_Container */ -Ewl_Orientation orientation;/**< The orientation of the paned */ + Ewl_Container container;/**< Inherit from Ewl_Container */ + Ewl_Orientation orientation;/**< The orientation of the paned */ Ecore_List *new_panes; /**< List of unplaced panes */ unsigned short updating_grabbers:1; /**< are we updating the grabbers */ }; -Ewl_Widget *ewl_paned_new(void); -Ewl_Widget *ewl_hpaned_new(void); -Ewl_Widget *ewl_vpaned_new(void); -int ewl_paned_init(Ewl_Paned *p); +Ewl_Widget *ewl_paned_new(void); +Ewl_Widget *ewl_hpaned_new(void); +Ewl_Widget *ewl_vpaned_new(void); +int ewl_paned_init(Ewl_Paned *p); -void ewl_paned_orientation_set(Ewl_Paned *p, Ewl_Orientation o); -Ewl_Orientation ewl_paned_orientation_get(Ewl_Paned *p); +voidewl_paned_orientation_set(Ewl_Paned *p, Ewl_Orientation o); +Ewl_Orientation ewl_paned_orientation_get(Ewl_Paned *p); /* * Internal functions. Override at your risk. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_color_classes.c Log Message: Reset to default colors when a class is disabled. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_color_classes.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_int_config_color_classes.c10 Oct 2006 13:37:37 - 1.18 +++ e_int_config_color_classes.c11 Oct 2006 03:53:31 - 1.19 @@ -515,9 +515,24 @@ icon = edje_object_add(evas_object_evas_get(cfdata->gui.ilist)); e_util_edje_icon_set(icon, "enlightenment/e"); } - else - icon = NULL; - + else + { +c->r = 255; +c->g = 255; +c->b = 255; +c->a = 255; +c->r2 = 0; +c->g2 = 0; +c->b2 = 0; +c->a2 = 255; +c->r3 = 0; +c->g3 = 0; +c->b3 = 0; +c->a3 = 255; +icon = NULL; +_update_colors(cfdata, c); + } + e_widget_ilist_nth_icon_set(cfdata->gui.ilist, n, icon); break; } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm.c Log Message: and stacking got screwed with the verlay. fixed. === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- e_fm.c 9 Oct 2006 13:43:35 - 1.85 +++ e_fm.c 11 Oct 2006 03:24:11 - 1.86 @@ -3832,13 +3832,6 @@ evas_object_event_callback_add(sd->underlay, EVAS_CALLBACK_MOUSE_UP, _e_fm2_cb_mouse_up, sd); evas_object_event_callback_add(sd->underlay, EVAS_CALLBACK_MOUSE_MOVE, _e_fm2_cb_mouse_move, sd); - sd->overlay = edje_object_add(evas_object_evas_get(obj)); - evas_object_clip_set(sd->overlay, sd->clip); - e_theme_edje_object_set(sd->overlay, "base/theme/fileman", - "e/fileman/overlay"); - evas_object_smart_member_add(sd->overlay, obj); - evas_object_show(sd->overlay); - sd->drop = edje_object_add(evas_object_evas_get(obj)); evas_object_clip_set(sd->drop, sd->clip); e_theme_edje_object_set(sd->drop, "base/theme/fileman", @@ -3852,6 +3845,13 @@ "e/fileman/list/drop_in"); evas_object_smart_member_add(sd->drop_in, obj); evas_object_show(sd->drop_in); + + sd->overlay = edje_object_add(evas_object_evas_get(obj)); + evas_object_clip_set(sd->overlay, sd->clip); + e_theme_edje_object_set(sd->overlay, "base/theme/fileman", + "e/fileman/overlay"); + evas_object_smart_member_add(sd->overlay, obj); + evas_object_show(sd->overlay); evas_object_smart_data_set(obj, sd); evas_object_move(obj, 0, 0); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl quan74
Enlightenment CVS committal Author : quan74 Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: ewl.spec.in Log Message: add ewl.cfg to spec as a config file === RCS file: /cvs/e/e17/libs/ewl/ewl.spec.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl.spec.in 17 Sep 2006 22:08:11 - 1.13 +++ ewl.spec.in 10 Oct 2006 23:39:50 - 1.14 @@ -67,6 +67,8 @@ %{_libdir}/libewl.la %{_libdir}/ewl/engines/* %{_datadir}/ewl +%{_bindir}/ewl_config +%config(noreplace) %{_sysconfdir}/ewl/* %files devel %defattr(-, root, root) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: debian kaethorn
Enlightenment CVS committal Author : kaethorn Project : e_modules Module : debian Dir : e_modules/debian Modified Files: emodule0-mixer.install Log Message: .eap -> .desktop update for mixer module package === RCS file: /cvs/e/e_modules/debian/emodule0-mixer.install,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- emodule0-mixer.install 8 Sep 2006 20:32:13 - 1.1 +++ emodule0-mixer.install 10 Oct 2006 23:35:54 - 1.2 @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/enlightenment/modules/mixer/*.eap +debian/tmp/usr/lib/enlightenment/modules/mixer/*.desktop debian/tmp/usr/lib/enlightenment/modules/mixer/*.edj debian/tmp/usr/lib/enlightenment/modules/mixer/*/*.so - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_enums.h Log Message: add comments === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- ewl_enums.h 10 Oct 2006 21:32:16 - 1.57 +++ ewl_enums.h 10 Oct 2006 22:06:56 - 1.58 @@ -726,11 +726,11 @@ */ enum Ewl_Rotate { - EWL_ROTATE_CW_90, - EWL_ROTATE_180, - EWL_ROTATE_CW_270, - EWL_ROTATE_CC_90, - EWL_ROTATE_CC_270 + EWL_ROTATE_CW_90, /**< 90 degree clockwise rotation */ + EWL_ROTATE_180, /**< 180 degree rotation */ + EWL_ROTATE_CW_270, /**< 270 degree clockwise rotation */ + EWL_ROTATE_CC_90, /**< 90 degree counter-clockwise rotation */ + EWL_ROTATE_CC_270 /**< 270 degree counter-clockwise rotation */ }; /** - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: ewl-config.in Log Message: and apps have their conf file in sysconfdir/ewl/apps === RCS file: /cvs/e/e17/libs/ewl/ewl-config.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl-config.in 30 Sep 2006 22:31:36 - 1.14 +++ ewl-config.in 10 Oct 2006 21:43:53 - 1.15 @@ -55,7 +55,7 @@ echo @prefix@/share/ewl/examples ;; --app-config-dir) - echo @prefix@/share/ewl/config/apps + echo @sysconfdir@/ewl/config/apps ;; *) echo "${usage}" 1>&2 - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_enums.h ewl_image.c ewl_image.h Log Message: - add rephorms image rotation and flip code to ewl. you can now do things like ewl_image_flip(img, EWL_ORIENTATION_HORIZONTAL) or ewl_image_rotate(img, EWL_ROTATE_CW_90) === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- ewl_enums.h 26 Sep 2006 18:33:47 - 1.56 +++ ewl_enums.h 10 Oct 2006 21:32:16 - 1.57 @@ -721,6 +721,24 @@ typedef enum Ewl_Text_Wrap Ewl_Text_Wrap; /** + * @enum Ewl_Rotate + * The rotate values + */ +enum Ewl_Rotate +{ + EWL_ROTATE_CW_90, + EWL_ROTATE_180, + EWL_ROTATE_CW_270, + EWL_ROTATE_CC_90, + EWL_ROTATE_CC_270 +}; + +/** + * The Ewl_Rotate + */ +typedef enum Ewl_Rotate Ewl_Rotate; + +/** * @} */ #endif /* __EWL_ENUMS_H__ */ === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- ewl_image.c 9 Oct 2006 06:21:17 - 1.49 +++ ewl_image.c 10 Oct 2006 21:32:16 - 1.50 @@ -15,6 +15,9 @@ static Ewl_Image_Type ewl_image_type_get(const char *i); static void ewl_image_thumbnail_cb_destroy(Ewl_Widget *w, void *ev, void *data); +static void ewl_image_rotate_180(Ewl_Image *img); +static void ewl_image_rotate_90(Ewl_Image *img, int cc); + /** * @return Returns a pointer to a new image widget on success, NULL on failure. * @brief Load an image widget with specified image contents @@ -475,6 +478,97 @@ } /** + * @param img: The image to flip + * @param orient: The orientation to flip + * @return Returns no value + * @brief Flips the given image in the given direction + */ +void +ewl_image_flip(Ewl_Image *img, Ewl_Orientation orient) +{ + int ix, iy, ox, oy, mx, my, i, j, w, h; + int *ia, *ib, *oa, *ob, s; + unsigned int *in; + unsigned int tmp; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("img", img); + DCHECK_TYPE("img", img, EWL_IMAGE_TYPE); + + evas_object_image_size_get(img->image, &w, &h); + in = evas_object_image_data_get(img->image, TRUE); + + if (orient == EWL_ORIENTATION_VERTICAL) + { + mx = w; + my = h / 2; + ia = &iy; + ib = &ix; + oa = &oy; + ob = &ox; + s = h; + } + else + { + mx = w / 2; + my = h; + ia = &ix; + ib = &iy; + oa = &ox; + ob = &oy; + s = w; + } + + for (iy = 0; iy < my; iy++) + { + for (ix = 0; ix < mx; ix++) + { + *oa = s - 1 - *ia; + *ob = *ib; + + i = iy * w + ix; + j = oy * w + ox; + + tmp = in[j]; + in[j] = in[i]; + in[i] = tmp; + } + } + + evas_object_image_data_set(img->image, in); + evas_object_image_data_update_add(img->image, 0, 0, w, h); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** + * @param i: The image to rotate + * @param rotate: The amount to rotate the image + * @return Returns no value + * @brief Rotates the given image by the given @a rotate value + */ +void +ewl_image_rotate(Ewl_Image *i, Ewl_Rotate rotate) +{ + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("i", i); + DCHECK_TYPE("i", i, EWL_IMAGE_TYPE); + + if (rotate == EWL_ROTATE_180) + ewl_image_rotate_180(i); + + else if ((rotate == EWL_ROTATE_CW_90) || + (rotate == EWL_ROTATE_CC_270)) + ewl_image_rotate_90(i, FALSE); + + else + ewl_image_rotate_90(i, TRUE); + + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** * @param i: the image to thumbnail * @return Returns a thumbnailed image widget on success, NULL on failure. * @brief Create a widget representing a thumbnailed version of the image. @@ -1017,6 +,103 @@ evas_event_feed_mouse_move(emb->evas, ev->x, ev->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0x), NULL); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +static void +ewl_image_rotate_90(Ewl_Image *img, int cc) +{ + int i, j, w = 0, h = 0, ix, iy, ox, oy, os, ow, oh; + int *ia, *ib, *oa, *ob; + unsigned int *in, *out; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("img", img); + DCHECK_TYPE("img", img, EWL_IMAGE_TYPE);
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: configure.in Log Message: move the ewl.cfg file to PACKAGE_SYSCONF_DIR/ewl === RCS file: /cvs/e/e17/libs/ewl/configure.in,v retrieving revision 1.82 retrieving revision 1.83 diff -u -3 -r1.82 -r1.83 --- configure.in1 Oct 2006 07:27:11 - 1.82 +++ configure.in10 Oct 2006 21:26:24 - 1.83 @@ -31,11 +31,13 @@ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${PACKAGE}/locale", [Locale data directory]) fi -dnl Set PACKAGE_DATA_DIR in config.h. +dnl Set PACKAGE_DATA_DIR and PACKAGE_SYSCONF_DIR in config.h. if test "x${prefix}" = "xNONE"; then AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory]) + AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${ac_default_prefix}/etc", [System Configuration Directory]) else AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory]) + AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${sysconfdir}", [System Configuration Directory]) fi dnl Set PACKAGE_LIB_DIR in config.h. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/config Modified Files: Makefile.am Log Message: move the ewl.cfg file to PACKAGE_SYSCONF_DIR/ewl === RCS file: /cvs/e/e17/libs/ewl/data/config/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 30 Sep 2006 22:31:36 - 1.1 +++ Makefile.am 10 Oct 2006 21:26:24 - 1.2 @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makfile.in -configdir = $(pkgdatadir)/config/ +configdir = $(sysconfdir)/ewl config_DATA = ewl.cfg EXTRA_DIST = $(config_DATA) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_config.c Log Message: move the ewl.cfg file to PACKAGE_SYSCONF_DIR/ewl === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ewl_config.c10 Oct 2006 20:40:38 - 1.18 +++ ewl_config.c10 Oct 2006 21:26:24 - 1.19 @@ -532,7 +532,7 @@ fname = ewl_config_file_name_clean(cfg); snprintf(cfg_filename, sizeof(cfg_filename), - "%s/config/%s%s.cfg", PACKAGE_DATA_DIR, + "%s/ewl/%s%s.cfg", PACKAGE_SYSCONF_DIR, (is_ewl ? "" : "apps/"), fname); FREE(fname); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_config.c ewl_config.h Log Message: add ewl_config_color_set/get === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_config.c8 Oct 2006 02:08:06 - 1.17 +++ ewl_config.c10 Oct 2006 20:40:38 - 1.18 @@ -278,6 +278,69 @@ /** * @param cfg: The Ewl_Config to work with + * @param k: the key to set in the configuration database + * @param r: the red value that will be associated with the key + * @param g: the green value that will be associated with the key + * @param b: the blue value that will be associated with the key + * @param a: the alpha value that will be associated with the key + * @return Returns no value + * @brief Set the value of key to the specified color + * + * Sets the color value associated with the key @a k to @a v in the + * configuration database. + */ +void +ewl_config_color_set(Ewl_Config *cfg, const char *k, int r, int g, + int b, int a, + Ewl_State_Type state) +{ + char buf[128]; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("k", k); + + snprintf(buf, sizeof(buf), "%i %i %i %i", r, g, b, a); + ecore_hash_set(ewl_config_set_hash_get(cfg, state), + strdup(k), strdup(buf)); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** + * @param cfg: The Ewl_Config to work with + * @param k: the key to search + * @param r: the red value that is associated with the key + * @param g: the green value that is associated with the key + * @param b: the blue value that is associated with the key + * @param a: the alpha value that is associated with the key + * @return Returns no value + * @brief Retrieve color associated with a key + */ +void +ewl_config_color_get(Ewl_Config *cfg, const char *k, int *r, int *g, + int *b, int *a) +{ + const char *val; + int tmp_r = 0, tmp_g = 0, tmp_b = 0, tmp_a = 0; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("k", k); + + val = ewl_config_get(cfg, k); + if (val) + sscanf(val, "%i %i %i %i", &tmp_r, &tmp_g, &tmp_b, &tmp_a); + + if (r) *r = tmp_r; + if (g) *g = tmp_g; + if (b) *b = tmp_b; + if (a) *a = tmp_a; + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + + +/** + * @param cfg: The Ewl_Config to work with * @return Returns TRUE if the user can write to the system conf file, FALSE * otherwise * @brief Determines if the user can write the system config file === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ewl_config.h2 Oct 2006 05:19:24 - 1.18 +++ ewl_config.h10 Oct 2006 20:40:38 - 1.19 @@ -48,6 +48,13 @@ Ewl_State_Type state); float ewl_config_float_get(Ewl_Config *cfg, const char *k); +voidewl_config_color_set(Ewl_Config *cfg, const char *k, + int r, int g, int b, int a, + Ewl_State_Type state); +voidewl_config_color_get(Ewl_Config *cfg, const char *k, + int *r, int *g, + int *b, int *a); + int ewl_config_can_save_system(Ewl_Config *cfg); int ewl_config_system_save(Ewl_Config *cfg); int ewl_config_user_save(Ewl_Config *cfg); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/software_xcb Modified Files: evas_engine.c evas_engine.h evas_outbuf.c evas_xcb_buffer.c Log Message: automated tools can not be perfect === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_engine.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- evas_engine.c 10 Oct 2006 19:15:13 - 1.14 +++ evas_engine.c 10 Oct 2006 19:32:36 - 1.15 @@ -186,7 +186,7 @@ static Evas_Performance * _output_perf_new(Evas *e, xcb_connection_t *conn, xcb_visualtype_t *vis, xcb_colormap_t cmap, xcb_drawable_t draw, int depth) { - return evas_software_xcb_generate_id_x(conn, draw, vis, cmap, depth); + return evas_software_xcb_outbuf_perf_x(conn, draw, vis, cmap, depth); e = NULL; } @@ -414,7 +414,7 @@ re->end = 1; } - surface = evas_software_xcb_generate_id_region_for_update(re->ob, + surface = evas_software_xcb_outbuf_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch); *x = ux; *y = uy; *w = uw; *h = uh; === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_engine.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- evas_engine.h 10 Oct 2006 19:15:13 - 1.6 +++ evas_engine.h 10 Oct 2006 19:32:36 - 1.7 @@ -118,7 +118,7 @@ int w, int y); intevas_software_xcb_x_can_do_shm (xcb_connection_t *c); -Xcb_Output_Buffer *evas_software_xcb_generate_id (xcb_connection_t *c, +Xcb_Output_Buffer *evas_software_xcb_x_output_buffer_new (xcb_connection_t *c, int depth, int w, int h, @@ -172,7 +172,7 @@ char*evas_software_xcb_outbuf_perf_serialize_x (Outbuf_Perf *perf); void evas_software_xcb_outbuf_perf_deserialize_x (Outbuf_Perf *perf, const char *data); -Outbuf_Perf *evas_software_xcb_generate_id_x (xcb_connection_t *conn, +Outbuf_Perf *evas_software_xcb_outbuf_perf_new_x (xcb_connection_t *conn, xcb_drawable_t draw, xcb_visualtype_t *vis, xcb_colormap_t cmap, @@ -204,7 +204,7 @@ int y, int w, int h); -RGBA_Image *evas_software_xcb_generate_id_region_for_update (Outbuf *buf, +RGBA_Image *evas_software_xcb_outbuf_new_region_for_update (Outbuf *buf, int x, int y, int w, === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_outbuf.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- evas_outbuf.c 10 Oct 2006 19:15:13 - 1.11 +++ evas_outbuf.c 10 Oct 2006 19:32:36 - 1.12 @@ -75,7 +75,7 @@ Xcb_Output_Buffer *xcbob; buf->priv.x.shm = evas_software_xcb_x_can_do_shm(buf->priv.x.conn); - xcbob = evas_software_xcb_generate_id(buf->priv.x.conn, + xcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn, buf->priv.x.depth, 1, 1, buf->priv.x.shm, NULL); @@ -258,7 +258,7 @@ } RGBA_Image * -evas_software_xcb_generate_id_region_for_update(Outbuf *buf, +evas_software_xcb_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w, @@ -305,7 +305,7 @@ im->image->data = NULL; im->image->no_free = 1; im->extended_info = obr; - obr->xcbob = evas_soft
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/bin Modified Files: evas_software_xcb_main.c evas_software_xcb_perf_load.c evas_software_xcb_perf_test.c evas_xrender_xcb_main.c Log Message: update to the new new api of XCB === RCS file: /cvs/e/e17/libs/evas/src/bin/evas_software_xcb_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- evas_software_xcb_main.c1 Oct 2006 18:27:12 - 1.12 +++ evas_software_xcb_main.c10 Oct 2006 19:16:16 - 1.13 @@ -25,7 +25,7 @@ iter_vis = xcb_depth_visuals_iterator(iter_depth.data); for (; iter_vis.rem; --screen, xcb_visualtype_next (&iter_vis)) { -if (screen->root_visual.id == iter_vis.data->visual_id.id) +if (screen->root_visual == iter_vis.data->visual_id) return iter_vis.data; } } @@ -121,14 +121,14 @@ intpause_me = 0; xcb_connection_t *conn; const xcb_query_extension_reply_t *rep_shm; - xcb_get_input_focus_reply_t*reply; - xcb_screen_t *screen = NULL; - xcb_screen_iterator_t iter_screen; - xcb_drawable_t win; - xcb_generic_event_t*e; - uint32_tmask; - uint32_tvalue[6]; - int screen_nbr; + xcb_get_input_focus_reply_t *reply; + xcb_screen_t *screen = NULL; + xcb_screen_iterator_t iter_screen; + xcb_window_t win; + xcb_generic_event_t *e; + uint32_t mask; + uint32_t value[6]; + intscreen_nbr; conn = xcb_connect (NULL, &screen_nbr); if (!conn) @@ -163,12 +163,12 @@ value[2] = XCB_GRAVITY_BIT_FORGET; value[3] = XCB_BACKING_STORE_NOT_USEFUL; value[4] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION | XCB_EVENT_MASK_STRUCTURE_NOTIFY; - value[5] = screen->default_colormap.xid; + value[5] = screen->default_colormap; - win.window = xcb_window_new(conn); + win = xcb_generate_id (conn); xcb_create_window (conn, screen->root_depth, - win.window, screen->root, + win, screen->root, 0, 0, win_w, win_h, 0, @@ -176,8 +176,8 @@ screen->root_visual, mask, value); - title_set (conn, win.window, "Evas Software XCB Test"); - class_set (conn, win.window, "Evas_Software_XCB_Test", "Main"); + title_set (conn, win, "Evas Software XCB Test"); + class_set (conn, win, "Evas_Software_XCB_Test", "Main"); #if 0 szhints = AllocSizeHints(); SizeHintsSetMinSize(szhints, win_w, win_h); @@ -186,7 +186,7 @@ SetWMNormalHints(conn, win.window, szhints); FreeSizeHints(szhints); #endif - xcb_map_window (conn, win.window); + xcb_map_window (conn, win); /* we sync */ reply = xcb_get_input_focus_reply(conn, xcb_get_input_focus_unchecked(conn), @@ -319,7 +319,7 @@ while (1) { - e = xcb_poll_for_event(conn, NULL); + e = xcb_poll_for_event(conn); if (e) { switch (e->response_type) @@ -327,7 +327,7 @@ case XCB_BUTTON_PRESS: { xcb_button_press_event_t *ev = (xcb_button_press_event_t *)e; -if (ev->detail.id == 3) +if (ev->detail == 3) { free(e); goto exit; === RCS file: /cvs/e/e17/libs/evas/src/bin/evas_software_xcb_perf_load.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- evas_software_xcb_perf_load.c 1 Oct 2006 18:27:12 - 1.6 +++ evas_software_xcb_perf_load.c 10 Oct 2006 19:16:16 - 1.7 @@ -16,7 +16,7 @@ #include "Evas_Engine_Software_Xcb.h" xcb_connection_t *c = NULL; -xcb_drawable_twin; +xcb_window_t win; Evas *evas = NULL; @@ -39,7 +39,7 @@ iter_vis = xcb_depth_visuals_iterator(iter_depth.data); for (; iter_vis.rem; --screen, xcb_visualtype_next (&iter_vis)) { -if (screen->root_visual.id == iter_vis.data->visual_id.id) +if (screen->root_visual == iter_vis.data->visual_id) return iter_vis.data; } } @@ -170,12 +170,12 @@ value[2] = XCB_GRAVITY_BIT_FORGET; value[3] = XCB_BACKING_STORE_NOT_USEFUL; value[4] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS | XCB_EV
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/xrender_xcb Modified Files: evas_engine.c evas_engine_font.c evas_engine_image.c evas_engine_ximage.c evas_engine_xrender.c Log Message: update to the new new api of XCB. The xrender engine needs review === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_xcb/evas_engine.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- evas_engine.c 1 Oct 2006 18:26:47 - 1.10 +++ evas_engine.c 10 Oct 2006 19:15:48 - 1.11 @@ -170,14 +170,14 @@ if (re->output) _xr_render_surface_free(re->output); if (re->mask_output) _xr_render_surface_free(re->mask_output); - if (!re->mask.xid) + if (!re->mask) re->output = _xr_render_surface_adopt(re->xcbinf, re->win, e->output.w, e->output.h, re->destination_alpha); else re->output = _xr_render_surface_adopt(re->xcbinf, re->win, e->output.w, e->output.h, 0); - if (re->mask.xid) { + if (re->mask) { xcb_drawable_t draw; - draw.pixmap = re->mask; + draw = re->mask; re->mask_output = _xr_render_surface_format_adopt(re->xcbinf, draw, e->output.w, e->output.h, re->xcbinf->fmt1, 1); @@ -238,7 +238,7 @@ xcb_drawable_t draw; if (re->mask_output) _xr_render_surface_free(re->mask_output); -draw.pixmap = re->mask; +draw = re->mask; re->mask_output = _xr_render_surface_format_adopt(re->xcbinf, draw, w, h, re->xcbinf->fmt1, 1); @@ -315,7 +315,7 @@ *x = ux; *y = uy; *w = uw; *h = uh; *cx = 0; *cy = 0; *cw = uw; *ch = uh; - if ((re->destination_alpha) || (re->mask.xid)) + if ((re->destination_alpha) || (re->mask)) { Xcb_Render_Surface *surface; === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_xcb/evas_engine_font.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evas_engine_font.c 1 Oct 2006 18:26:47 - 1.3 +++ evas_engine_font.c 10 Oct 2006 19:15:48 - 1.4 @@ -29,9 +29,9 @@ { fs = fg->ext_dat; if ((fs->xcbinf->conn == xcbinf->conn) && -(fs->xcbinf->root.window.xid == xcbinf->root.window.xid)) +(fs->xcbinf->root == xcbinf->root)) return fs; - snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); + snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root); pool = evas_hash_find(_xr_fg_pool, buf); if (pool) { @@ -50,20 +50,20 @@ fs->w = w; fs->h = h; - snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); + snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root); pool = evas_hash_find(_xr_fg_pool, buf); snprintf(buf2, sizeof(buf2), "%p", fg); pool = evas_hash_add(pool, buf2, fs); _xr_fg_pool = evas_hash_add(_xr_fg_pool, buf, pool); - fs->draw.pixmap = xcb_pixmap_new(xcbinf->conn); - xcb_create_pixmap(xcbinf->conn, xcbinf->fmt8->depth, fs->draw.pixmap, xcbinf->root, w, h); + fs->draw = xcb_generate_id(xcbinf->conn); + xcb_create_pixmap(xcbinf->conn, xcbinf->fmt8->depth, fs->draw, xcbinf->root, w, h); mask = XCB_RENDER_CP_REPEAT | XCB_RENDER_CP_DITHER | XCB_RENDER_CP_COMPONENT_ALPHA; values[0] = 0; values[1] = 0; values[2] = 0; - fs->pic = xcb_render_picture_new(xcbinf->conn); + fs->pic = xcb_generate_id(xcbinf->conn); xcb_render_create_picture(xcbinf->conn, fs->pic, fs->draw, xcbinf->fmt8->id, mask, values); xcim = _xr_image_new(fs->xcbinf, w, h, xcbinf->fmt8->depth); @@ -137,7 +137,7 @@ fs = fdata; pool = data; - snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); + snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root); pool = evas_hash_del(pool, buf, fs); hash = evas_hash_modify(hash, key, pool); return 1; @@ -148,7 +148,7 @@ { if (!fs) return; evas_hash_foreach(_xr_fg_pool, _xre_font_pool_cb, fs); - xcb_free_pixmap(fs->xcbinf->conn, fs->draw.pixmap); + xcb_free_pixmap(fs->xcbinf->conn, fs->draw); xcb_render_free_picture(fs->xcbinf->conn, fs->pic); _xr_image_info_free(fs->xcbinf); free(fs); === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_xcb/evas_engine_image.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- evas_engine_image.c 1 Oct 2006 18:26:47 -00
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/software_xcb Modified Files: evas_engine.c evas_engine.h evas_outbuf.c evas_xcb_buffer.c evas_xcb_color.c Log Message: update to the new new api of XCB === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_engine.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- evas_engine.c 1 Oct 2006 18:26:24 - 1.13 +++ evas_engine.c 10 Oct 2006 19:15:13 - 1.14 @@ -144,7 +144,7 @@ iter_vis = xcb_depth_visuals_iterator(iter_depth.data); for (; iter_vis.rem; --screen, xcb_visualtype_next (&iter_vis)) { -if (scr->root_visual.id == iter_vis.data->visual_id.id) +if (scr->root_visual == iter_vis.data->visual_id) return iter_vis.data; } } @@ -186,7 +186,7 @@ static Evas_Performance * _output_perf_new(Evas *e, xcb_connection_t *conn, xcb_visualtype_t *vis, xcb_colormap_t cmap, xcb_drawable_t draw, int depth) { - return evas_software_xcb_outbuf_perf_new_x(conn, draw, vis, cmap, depth); + return evas_software_xcb_generate_id_x(conn, draw, vis, cmap, depth); e = NULL; } @@ -414,7 +414,7 @@ re->end = 1; } - surface = evas_software_xcb_outbuf_new_region_for_update(re->ob, + surface = evas_software_xcb_generate_id_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch); *x = ux; *y = uy; *w = uw; *h = uh; === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_engine.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- evas_engine.h 1 Oct 2006 18:26:24 - 1.5 +++ evas_engine.h 10 Oct 2006 19:15:13 - 1.6 @@ -118,7 +118,7 @@ int w, int y); intevas_software_xcb_x_can_do_shm (xcb_connection_t *c); -Xcb_Output_Buffer *evas_software_xcb_x_output_buffer_new (xcb_connection_t *c, +Xcb_Output_Buffer *evas_software_xcb_generate_id (xcb_connection_t *c, int depth, int w, int h, @@ -172,7 +172,7 @@ char*evas_software_xcb_outbuf_perf_serialize_x (Outbuf_Perf *perf); void evas_software_xcb_outbuf_perf_deserialize_x (Outbuf_Perf *perf, const char *data); -Outbuf_Perf *evas_software_xcb_outbuf_perf_new_x (xcb_connection_t *conn, +Outbuf_Perf *evas_software_xcb_generate_id_x (xcb_connection_t *conn, xcb_drawable_t draw, xcb_visualtype_t *vis, xcb_colormap_t cmap, @@ -204,7 +204,7 @@ int y, int w, int h); -RGBA_Image *evas_software_xcb_outbuf_new_region_for_update (Outbuf *buf, +RGBA_Image *evas_software_xcb_generate_id_region_for_update (Outbuf *buf, int x, int y, int w, === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_outbuf.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- evas_outbuf.c 1 Oct 2006 18:26:24 - 1.10 +++ evas_outbuf.c 10 Oct 2006 19:15:13 - 1.11 @@ -17,7 +17,7 @@ { evas_software_xcb_outbuf_flush(buf); xcb_free_gc(buf->priv.x.conn, buf->priv.x.gc); - if (buf->priv.x.gcm.xid) + if (buf->priv.x.gcm) xcb_free_gc(buf->priv.x.conn, buf->priv.x.gcm); if (buf->priv.pal) evas_software_xcb_x_color_deallocate(buf->priv.x.conn, @@ -75,7 +75,7 @@ Xcb_Output_Buffer *xcbob; buf->priv.x.shm = evas_software_xcb_x_can_do_shm(buf->priv.x.conn); - xcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn, + xcbob = evas_software_xcb_generate_id(buf->priv.x
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Remove the color class gui config todo. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.457 retrieving revision 1.458 diff -u -3 -r1.457 -r1.458 --- TODO10 Oct 2006 16:28:29 - 1.457 +++ TODO10 Oct 2006 18:30:56 - 1.458 @@ -39,7 +39,6 @@ * add a "taskbar" module * add cpu load module * add setup/install wizard to seed .desktop files etc. etc. -* support color classes (gui config etc. etc.) * finish clientinfo dialog for borders (netwm props etc. etc.) * gui config dialogs for all config * make it possible to disable border buttons/actions (tell theme what is - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mixer onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : mixer Dir : e_modules/mixer Modified Files: .cvsignore Makefile.am configure.in e_mod_config.c e_mod_main.c Added Files: module.desktop.in module.edj Removed Files: module.eap Log Message: Convert to .desktop. === RCS file: /cvs/e/e_modules/mixer/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 7 Sep 2006 13:47:40 - 1.1 +++ .cvsignore 10 Oct 2006 18:27:34 - 1.2 @@ -21,4 +21,5 @@ *.la *.spec *.tar.gz -*.edj +mixer.edj +module.desktop === RCS file: /cvs/e/e_modules/mixer/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 18 Sep 2006 01:43:32 - 1.8 +++ Makefile.am 10 Oct 2006 18:27:34 - 1.9 @@ -6,7 +6,8 @@ -fd $(top_srcdir) files_DATA = \ -module.eap \ +module.desktop \ +module.edj \ mixer.edj EXTRA_DIST = \ @@ -44,10 +45,10 @@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h -%.edj: %.edc +mixer.edj: mixer.edc $(EDJE_CC) $(EDJE_FLAGS) $< $@ clean-local: -rm -rf *.edj *~ +rm -rf mixer.edj *~ uninstall: rm -rf $(datadir) === RCS file: /cvs/e/e_modules/mixer/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- configure.in18 Sep 2006 01:43:32 - 1.8 +++ configure.in10 Oct 2006 18:27:34 - 1.9 @@ -241,6 +241,7 @@ AC_OUTPUT([ Makefile e_modules-mixer.spec +module.desktop ],[ ]) === RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_mod_config.c 3 Oct 2006 03:39:15 - 1.16 +++ e_mod_config.c 10 Oct 2006 18:27:34 - 1.17 @@ -42,7 +42,7 @@ v->advanced.apply_cfdata = NULL; v->advanced.create_widgets = NULL; - snprintf(buf, sizeof(buf), "%s/module.eap", + snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(mixer_config->module)); con = e_container_current_get(e_manager_current_get()); === RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -3 -r1.52 -r1.53 --- e_mod_main.c9 Oct 2006 05:01:31 - 1.52 +++ e_mod_main.c10 Oct 2006 18:27:34 - 1.53 @@ -170,7 +170,7 @@ Evas_Object *o; char buf[4096]; - snprintf(buf, sizeof(buf), "%s/module.eap", + snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(mixer_config->module)); o = edje_object_add(evas); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_configure.c Log Message: Assign "Colors" dialog it's own icon in prep for Mano's commit, and move to just below themes. === RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- e_configure.c 10 Oct 2006 10:42:34 - 1.64 +++ e_configure.c 10 Oct 2006 17:48:15 - 1.65 @@ -91,8 +91,8 @@ e_configure_header_item_add(eco, "enlightenment/appearance", _("Appearance")); e_configure_standard_item_add(eco, "enlightenment/background", _("Wallpaper"), e_int_config_wallpaper); e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme"), e_int_config_theme); + e_configure_standard_item_add(eco, "enlightenment/colors", _("Colors"), e_int_config_color_classes); e_configure_standard_item_add(eco, "enlightenment/fonts", _("Fonts"), e_int_config_fonts); - e_configure_standard_item_add(eco, "enlightenment/themes", _("Colors"), e_int_config_color_classes); e_configure_standard_item_add(eco, "enlightenment/icon_themes", _("Icon Theme"), e_int_config_icon_themes); e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse Cursor"), e_int_config_cursor); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display"), e_int_config_window_display); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tclock devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c e_mod_main.c Log Message: Fix tclock to only use one timer for all instances, always polling at one second intervals. === RCS file: /cvs/e/e_modules/tclock/e_mod_config.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_mod_config.c 17 Sep 2006 16:46:53 - 1.27 +++ e_mod_config.c 10 Oct 2006 17:33:48 - 1.28 @@ -3,7 +3,6 @@ struct _E_Config_Dialog_Data { - int resolution; int show_date; int show_time; char *time_format; @@ -45,7 +44,6 @@ static void _fill_data (Config_Item * ci, E_Config_Dialog_Data * cfdata) { - cfdata->resolution = ci->resolution; cfdata->show_time = ci->show_time; cfdata->show_date = ci->show_date; cfdata->time_format = strdup (ci->time_format); @@ -85,14 +83,6 @@ o = e_widget_list_add (evas, 0, 0); - of = e_widget_framelist_add (evas, D_ ("Resolution"), 0); - rg = e_widget_radio_group_new (&(cfdata->resolution)); - ob = e_widget_radio_add (evas, D_ ("1 Minute"), RESOLUTION_MINUTE, rg); - e_widget_framelist_object_append (of, ob); - ob = e_widget_radio_add (evas, D_ ("1 Second"), RESOLUTION_SECOND, rg); - e_widget_framelist_object_append (of, ob); - e_widget_list_object_append (o, of, 1, 1, 0.5); - of = e_widget_frametable_add (evas, D_ ("Date"), 1); date_check = e_widget_check_add (evas, D_ ("Show Date"), &(cfdata->show_date)); @@ -142,15 +132,6 @@ if (ci->date_format) evas_stringshare_del (ci->date_format); ci->date_format = evas_stringshare_add (cfdata->date_format); - ci->resolution = cfdata->resolution; - if (cfdata->resolution == RESOLUTION_MINUTE) -ci->poll_time = 60.0; - else -ci->poll_time = 1.0; - - /* If we're not showing time, no reason to update every second */ - if (!cfdata->show_time) -ci->poll_time = 60.0; e_config_save_queue (); === RCS file: /cvs/e/e_modules/tclock/e_mod_main.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- e_mod_main.c17 Sep 2006 16:46:53 - 1.42 +++ e_mod_main.c10 Oct 2006 17:33:48 - 1.43 @@ -12,24 +12,22 @@ #endif /* Func Proto Requirements for Gadcon */ -static E_Gadcon_Client *_gc_init (E_Gadcon * gc, const char *name, - const char *id, const char *style); -static void _gc_shutdown (E_Gadcon_Client * gcc); -static void _gc_orient (E_Gadcon_Client * gcc); -static char *_gc_label (void); -static Evas_Object *_gc_icon (Evas * evas); +static E_Gadcon_Client *_gc_init (E_Gadcon *gc, const char *name, const char *id, const char *style); +static void _gc_shutdown (E_Gadcon_Client *gcc); +static void _gc_orient (E_Gadcon_Client *gcc); +static char*_gc_label(void); +static Evas_Object *_gc_icon (Evas *evas); /* Module Protos */ -static void _tclock_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, - void *event_info); -static void _tclock_menu_cb_configure (void *data, E_Menu * m, - E_Menu_Item * mi); -static void _tclock_menu_cb_post (void *data, E_Menu * m); -static int _tclock_cb_check (void *data); -static Config_Item *_tclock_config_item_get (const char *id); +static void _tclock_cb_mouse_down (void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _tclock_menu_cb_configure (void *data, E_Menu *m, E_Menu_Item *mi); +static void _tclock_menu_cb_post (void *data, E_Menu *m); +static int _tclock_cb_check (void *data); +static Config_Item *_tclock_config_item_get (const char *id); static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_item_edd = NULL; +static Ecore_Timer *check_timer; Config *tclock_config = NULL; @@ -45,7 +43,6 @@ { E_Gadcon_Client *gcc; Evas_Object *tclock; - Ecore_Timer *check_timer; }; static E_Gadcon_Client * @@ -83,7 +80,8 @@ evas_list_append (tclock_config->instances, inst); _tclock_cb_check (inst); - inst->check_timer = ecore_timer_add (ci->poll_time, _tclock_cb_check, inst); + if (!check_timer) + check_timer = ecore_timer_add (1.0, _tclock_cb_check, NULL); return gcc; } @@ -93,15 +91,21 @@ Instance *inst; inst = gcc->data; - if (inst->check_timer) -ecore_timer_del (inst->check_timer); - tclock_config->instances = -evas_list_remove (tclock_config->instances, inst); - + evas_object_event_callback_del (inst->tclock, EVAS_CALLBACK_MOUSE_DOWN, _tclock_cb_mouse_down); evas_object_del (inst->tclock); + + tclock_config->instances = +evas_list_remove (tclock_config->instances, inst); + +
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Added transition previews. Another one bites the dust :) === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.456 retrieving revision 1.457 diff -u -3 -r1.456 -r1.457 --- TODO10 Oct 2006 12:22:27 - 1.456 +++ TODO10 Oct 2006 16:28:29 - 1.457 @@ -26,7 +26,6 @@ * nuke the current eap cache mechanism entirely (and replace with .desktop cache) -* transition config dialog needs preview. * fm2 needs way to replace or extend the right click menu (disable/enable rename/delete/refresh etc.) * fm2 needs a mime filter - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_includes.h e_int_config_desks.c e_int_config_transitions.c Added Files: e_widget_trans_preview.c e_widget_trans_preview.h Log Message: Added transition preview widget. Added widget to the transition dialog. === RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.157 retrieving revision 1.158 diff -u -3 -r1.157 -r1.158 --- Makefile.am 9 Oct 2006 19:06:43 - 1.157 +++ Makefile.am 10 Oct 2006 16:26:29 - 1.158 @@ -174,7 +174,8 @@ e_int_config_transitions.h \ e_fwin.h \ e_widget_aspect.h \ -e_widget_desk_preview.h +e_widget_desk_preview.h \ +e_widget_trans_preview.h enlightenment_src = \ e_user.c \ @@ -325,6 +326,7 @@ e_fwin.c \ e_widget_aspect.c \ e_widget_desk_preview.c \ +e_widget_trans_preview.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ === RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.134 retrieving revision 1.135 diff -u -3 -r1.134 -r1.135 --- e_includes.h9 Oct 2006 19:06:43 - 1.134 +++ e_includes.h10 Oct 2006 16:26:29 - 1.135 @@ -151,3 +151,4 @@ #include "e_fwin.h" #include "e_widget_aspect.h" #include "e_widget_desk_preview.h" +#include "e_widget_trans_preview.h" === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desks.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- e_int_config_desks.c9 Oct 2006 19:55:20 - 1.25 +++ e_int_config_desks.c10 Oct 2006 16:26:29 - 1.26 @@ -281,5 +281,4 @@ E_Config_Dialog_Data *cfdata = data; e_widget_desk_preview_num_desks_set(cfdata->preview, cfdata->x, cfdata->y); - } === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_transitions.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_int_config_transitions.c 8 Oct 2006 08:04:17 - 1.5 +++ e_int_config_transitions.c 10 Oct 2006 16:26:29 - 1.6 @@ -16,6 +16,7 @@ Evas_Object *event_list; Evas_Object *trans_list; + Evas_Object *tp; }; EAPI E_Config_Dialog * @@ -104,9 +105,12 @@ static Evas_Object * _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ot, *il; + E_Zone *zone; + Evas_Object *o, *of, *ot, *il, *ob; Evas_List *l; char *t; + + zone = e_zone_current_get(cfd->con); o = e_widget_list_add(evas, 1, 0); ot = e_widget_table_add(evas, 0); @@ -114,7 +118,7 @@ of = e_widget_framelist_add(evas, _("Events"), 0); il = e_widget_ilist_add(evas, 48, 48, NULL); cfdata->event_list = il; - e_widget_min_size_set(il, 160, 200); + e_widget_min_size_set(il, 160, 225); e_widget_ilist_append(il, NULL, _("Startup"), _event_cb_changed, cfdata, NULL); e_widget_ilist_append(il, NULL, _("Desk Change"), _event_cb_changed, cfdata, NULL); e_widget_ilist_append(il, NULL, _("Background Change"), _event_cb_changed, cfdata, NULL); @@ -125,7 +129,7 @@ of = e_widget_framelist_add(evas, _("Transitions"), 0); il = e_widget_ilist_add(evas, 48, 48, NULL); cfdata->trans_list = il; - e_widget_min_size_set(il, 160, 200); + e_widget_min_size_set(il, 160, 225); e_widget_ilist_append(il, NULL, _("None"), _trans_cb_changed, cfdata, NULL); l = e_theme_transition_list(); @@ -140,6 +144,12 @@ e_widget_framelist_object_append(of, il); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1); + of = e_widget_framelist_add(evas, _("Preview"), 0); + ob = e_widget_trans_preview_add(evas, 300, ((300 * zone->h) / zone->w)); + cfdata->tp = ob; + e_widget_framelist_object_append(of, ob); + e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1); + e_widget_list_object_append(o, ot, 1, 1, 0.5); return o; @@ -223,4 +233,6 @@ default: break; } + if (!t) return; + e_widget_trans_preview_trans_set(cfdata->tp, t); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/elicit onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/elicit Dir : e17/apps/elicit/debian Added Files: .cvsignore Removed Files: changelog Log Message: Another generated file bites the dust. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : proto Dir : e17/proto/ephoto/src Removed Files: config.h.in Log Message: Strnage as it may seem, but config.h.in is also generated, and thus no point in having it in cvs. It was already in the .cvsignore. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : proto Dir : e17/proto/ephoto/po Added Files: .cvsignore Removed Files: ephoto.pot Log Message: .cvsignore++ and the pot file is generated. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_color_classes.c Log Message: Changed to generic module_label color class, rather then specifics for each module. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_color_classes.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_int_config_color_classes.c10 Oct 2006 11:12:51 - 1.17 +++ e_int_config_color_classes.c10 Oct 2006 13:37:37 - 1.18 @@ -80,12 +80,7 @@ const CFColor_Hash _mod_hash[] = { {NULL, N_("Modules")}, - {"battery_label", N_("Battery Label")}, - {"cpufreq_label", N_("Cpufreq Label")}, - {"ibar_label",N_("IBar Label")}, - {"ibox_label",N_("IBox Label")}, - {"pager_label", N_("Pager Label")}, - {"temperature_label", N_("Temperature Label")}, + {"module_label", N_("Module Label")}, {NULL, NULL} }; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_battery.edc default_cpufreq.edc default_ibar.edc default_ibox.edc default_pager.edc default_temperature.edc Log Message: Change to generic module label color class. === RCS file: /cvs/e/e17/apps/e/data/themes/default_battery.edc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- default_battery.edc 6 Oct 2006 02:25:57 - 1.13 +++ default_battery.edc 10 Oct 2006 13:36:31 - 1.14 @@ -159,7 +159,7 @@ color: 255 255 255 255; color2: 0 0 0 128; color3: 0 0 0 32; - color_class: "battery_label"; + color_class: "module_label"; text { text: "100%"; font: "Edje-Vera-Bold"; @@ -190,7 +190,7 @@ color: 255 255 255 255; color2: 0 0 0 128; color3: 0 0 0 32; - color_class: "battery_label"; + color_class: "module_label"; text { text: "00:00"; font: "Edje-Vera-Bold"; === RCS file: /cvs/e/e17/apps/e/data/themes/default_cpufreq.edc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- default_cpufreq.edc 6 Oct 2006 02:25:57 - 1.9 +++ default_cpufreq.edc 10 Oct 2006 13:36:31 - 1.10 @@ -304,7 +304,7 @@ color: 255 255 255 255; color2: 0 0 0 128; color3: 0 0 0 32; - color_class: "cpufreq_label"; + color_class: "module_label"; text { text: "??? Ghz"; font: "Edje-Vera-Bold"; === RCS file: /cvs/e/e17/apps/e/data/themes/default_ibar.edc,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- default_ibar.edc6 Oct 2006 00:27:29 - 1.21 +++ default_ibar.edc10 Oct 2006 13:36:31 - 1.22 @@ -234,7 +234,7 @@ } color: 255 255 255 255; color3: 0 0 0 42; - color_class: "ibar_label"; + color_class: "module_label"; } } } === RCS file: /cvs/e/e17/apps/e/data/themes/default_ibox.edc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- default_ibox.edc6 Oct 2006 02:25:57 - 1.5 +++ default_ibox.edc10 Oct 2006 13:36:31 - 1.6 @@ -212,7 +212,7 @@ } color: 255 255 255 0; color3: 0 0 0 0; - color_class: "ibox_label"; + color_class: "module_label"; text { text: "Icon Name"; font: "Edje-Vera-Bold"; === RCS file: /cvs/e/e17/apps/e/data/themes/default_pager.edc,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- default_pager.edc 10 Oct 2006 11:02:08 - 1.31 +++ default_pager.edc 10 Oct 2006 13:36:31 - 1.32 @@ -114,7 +114,7 @@ } color: 0 0 0 255; color3: 0 0 0 22; - color_class: "pager_label"; + color_class: "module_label"; text { text: "Title goes here"; font: "Edje-Vera-Bold"; === RCS file: /cvs/e/e17/apps/e/data/themes/default_temperature.edc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- default_temperature.edc 6 Oct 2006 02:25:57 - 1.10 +++ default_temperature.edc 10 Oct 2006 13:36:31 - 1.11 @@ -86,7 +86,7 @@ color: 255 255 255 255; color2: 0 0 0 128; color3: 0 0 0 32; - color_class: "temperature_label"; + color_class: "module_label"; text { text: "99^C"; font: "Edje-Vera-Bold"; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_gadcon_config.c Log Message: Ooops, forgot to remove debug printfs. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_int_gadcon_config.c 10 Oct 2006 12:13:30 - 1.30 +++ e_int_gadcon_config.c 10 Oct 2006 12:14:37 - 1.31 @@ -174,7 +174,6 @@ cfdata = data; i = e_widget_ilist_selected_get(cfdata->o_instances); name = e_widget_ilist_selected_label_get(cfdata->o_instances); - printf("Name: %s\n", name); for (l = cfdata->cf_gc->clients; l; l = l->next) { @@ -183,7 +182,6 @@ cf_gcc = l->data; if (!cf_gcc) continue; if (!cf_gcc->name) continue; - printf("Cf Name: %s\n", cf_gcc->name); if (!strcasecmp(cf_gcc->name, name)) { if (cf_gcc->name) evas_stringshare_del(cf_gcc->name); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_gadcon_config.c Log Message: Fix the "Shelf Contents" remove bug. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- e_int_gadcon_config.c 21 Aug 2006 16:18:49 - 1.29 +++ e_int_gadcon_config.c 10 Oct 2006 12:13:30 - 1.30 @@ -168,20 +168,32 @@ { int i; E_Config_Dialog_Data *cfdata; - E_Config_Gadcon_Client *cf_gcc; Evas_List *l; - + const char *name; + cfdata = data; i = e_widget_ilist_selected_get(cfdata->o_instances); - l = evas_list_nth_list(cfdata->cf_gc->clients, i); - cf_gcc = l->data; + name = e_widget_ilist_selected_label_get(cfdata->o_instances); + printf("Name: %s\n", name); - if (cf_gcc->name) evas_stringshare_del(cf_gcc->name); - if (cf_gcc->id) evas_stringshare_del(cf_gcc->id); - if (cf_gcc->style) evas_stringshare_del(cf_gcc->style); - free(cf_gcc); + for (l = cfdata->cf_gc->clients; l; l = l->next) + { + E_Config_Gadcon_Client *cf_gcc; - cfdata->cf_gc->clients = evas_list_remove_list(cfdata->cf_gc->clients, l); + cf_gcc = l->data; + if (!cf_gcc) continue; + if (!cf_gcc->name) continue; + printf("Cf Name: %s\n", cf_gcc->name); + if (!strcasecmp(cf_gcc->name, name)) + { +if (cf_gcc->name) evas_stringshare_del(cf_gcc->name); +if (cf_gcc->id) evas_stringshare_del(cf_gcc->id); +if (cf_gcc->style) evas_stringshare_del(cf_gcc->style); +cfdata->cf_gc->clients = evas_list_remove(cfdata->cf_gc->clients, cf_gcc); +free(cf_gcc); +break; + } + } _load_selected_gadgets(cfdata); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Added a virtual desks preview widget bug. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.455 retrieving revision 1.456 diff -u -3 -r1.455 -r1.456 --- TODO10 Oct 2006 12:13:55 - 1.455 +++ TODO10 Oct 2006 12:22:27 - 1.456 @@ -16,6 +16,7 @@ * BUG: "match this window only" doesnt fall back to other unused remembers * BUG: xdaliclock -transparent doesnt use shaped border (not handling shape change later) +* BUG: Virtual desks preview widget overlaps the sliders when desk counts are 1 ]]] [[[ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Begone "Shelf Contents Remove" Bug :) === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.454 retrieving revision 1.455 diff -u -3 -r1.454 -r1.455 --- TODO9 Oct 2006 19:24:22 - 1.454 +++ TODO10 Oct 2006 12:13:55 - 1.455 @@ -16,8 +16,6 @@ * BUG: "match this window only" doesnt fall back to other unused remembers * BUG: xdaliclock -transparent doesnt use shaped border (not handling shape change later) -* BUG: Removing a module from a shelf with the "Shelf Contents" dialog sometimes - has no effect, or it sometimes removes the wrong module ]]] [[[ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Modified Files: .cvsignore Log Message: cvsignore++ === RCS file: /cvs/e/e17/proto/ephoto/data/images/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 1 Oct 2006 04:37:57 - 1.3 +++ .cvsignore 10 Oct 2006 13:05:34 - 1.4 @@ -1,2 +1,3 @@ Makefile Makefile.in +*.edj - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: moon onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : moon Dir : e_modules/moon/data/themes Removed Files: module.edj Log Message: No need to store a generated file that is already .cvsignored. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: taskbar onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : taskbar Dir : e_modules/taskbar Modified Files: .cvsignore Log Message: cvsignore++ === RCS file: /cvs/e/e_modules/taskbar/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 17 Sep 2006 16:35:34 - 1.3 +++ .cvsignore 10 Oct 2006 12:41:49 - 1.4 @@ -14,6 +14,7 @@ config.sub configure depcomp +e_modules-taskbar.spec install-sh libtool missing - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.h Log Message: Update color classes for GUI'd :) === RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.123 retrieving revision 1.124 diff -u -3 -r1.123 -r1.124 --- e_config.h 1 Oct 2006 20:10:37 - 1.123 +++ e_config.h 10 Oct 2006 11:47:05 - 1.124 @@ -210,7 +210,7 @@ int exebuf_pos_max_w; // GUI int exebuf_pos_max_h; // GUI const char *exebuf_term_cmd; // GUI - Evas_List *color_classes; + Evas_List *color_classes; // GUI int use_app_icon; // GUI int cfgdlg_auto_apply; // GUI int cfgdlg_default_mode; // GUI - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_winlist.edc Log Message: Add winlist color classes. Why does winlist/item/e.text.label have 2 text_classes ? Typo ? === RCS file: /cvs/e/e17/apps/e/data/themes/default_winlist.edc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- default_winlist.edc 30 Sep 2006 18:59:14 - 1.12 +++ default_winlist.edc 10 Oct 2006 11:14:04 - 1.13 @@ -179,6 +179,7 @@ } color: 255 255 255 255; color3: 0 0 0 22; + color_class: "winlist_title"; text { text: "Title goes here"; font: "Edje-Vera-Bold"; @@ -227,6 +228,7 @@ } color: 0 0 0 255; color3: 0 0 0 22; + color_class: "winlist_label"; text { text: "Title goes here"; font: "Edje-Vera-Bold"; @@ -529,6 +531,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "winlist_item"; text { text: "Item Label"; font: "Edje-Vera"; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_color_classes.c Log Message: Implement some more color classes. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_color_classes.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_int_config_color_classes.c10 Oct 2006 11:03:12 - 1.16 +++ e_int_config_color_classes.c10 Oct 2006 11:12:51 - 1.17 @@ -51,7 +51,10 @@ {"menu_title_active", N_("Menu Title Active")}, {"menu_item", N_("Menu Item")}, {"move_text", N_("Move Text")}, - {"resize_text",N_("Resize Text")}, + {"resize_text",N_("Resize Text")}, + {"winlist_item", N_("Winlist Item")}, + {"winlist_label", N_("Winlist Label")}, + {"winlist_title", N_("Winlist Title")}, {NULL, NULL} }; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_color_classes.c Log Message: Implement newly added color classes. Remove unused function & declaration. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_color_classes.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_int_config_color_classes.c10 Oct 2006 10:40:56 - 1.15 +++ e_int_config_color_classes.c10 Oct 2006 11:03:12 - 1.16 @@ -50,6 +50,8 @@ {"menu_title", N_("Menu Title")}, {"menu_title_active", N_("Menu Title Active")}, {"menu_item", N_("Menu Item")}, + {"move_text", N_("Move Text")}, + {"resize_text",N_("Resize Text")}, {NULL, NULL} }; @@ -61,6 +63,7 @@ {"check_text", N_("Check Text")}, {"check_text_disabled", N_("Check Text Disabled")}, {"entry_text", N_("Entry Text")}, + {"label_text", N_("Label Text")}, {"ilist_item", N_("List Item Text")}, {"ilist_item_odd", N_("List Item Odd Text")}, {"ilist_header", N_("List Header")}, @@ -78,6 +81,7 @@ {"cpufreq_label", N_("Cpufreq Label")}, {"ibar_label",N_("IBar Label")}, {"ibox_label",N_("IBox Label")}, + {"pager_label", N_("Pager Label")}, {"temperature_label", N_("Temperature Label")}, {NULL, NULL} }; @@ -91,7 +95,6 @@ static void _fill_data_hash (E_Config_Dialog_Data *cfdata, const CFColor_Hash *cfhash); static void _fill_data_basic (E_Config_Dialog_Data *cfdata); -static void _fill_data_adv(E_Config_Dialog_Data *cfdata); static void _load_color_classes (Evas_Object *obj, E_Config_Dialog_Data *cfdata); static void _radio_cb_change (void *data, Evas_Object *obj, void *event_info); @@ -245,27 +248,6 @@ } } -static void -_fill_data_adv(E_Config_Dialog_Data *cfdata) -{ - while (cfdata->classes) - { - CFColor_Class *cfc; - - cfc = cfdata->classes->data; - if (!cfc) continue; - if (cfc->name) - evas_stringshare_del(cfc->name); - if (cfc->key) - evas_stringshare_del(cfc->key); - - cfdata->classes = evas_list_remove_list(cfdata->classes, cfdata->classes); - } - _fill_data_hash(cfdata, _wm_hash); - _fill_data_hash(cfdata, _wid_hash); - _fill_data_hash(cfdata, _mod_hash); -} - static void * _create_data(E_Config_Dialog *cfd) { @@ -419,8 +401,6 @@ Evas_Object *o, *of, *ob, *ot; E_Radio_Group *rg; Evas_List *l; - -// _fill_data_adv(cfdata); o = e_widget_list_add(evas, 0, 0); ot = e_widget_table_add(evas, 1); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_fileman.edc default_label.edc default_move.edc default_pager.edc default_resize.edc Log Message: Add a few more color classes to default theme. === RCS file: /cvs/e/e17/apps/e/data/themes/default_fileman.edc,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- default_fileman.edc 1 Oct 2006 12:05:33 - 1.47 +++ default_fileman.edc 10 Oct 2006 11:02:08 - 1.48 @@ -343,6 +343,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "ilist_item"; text { text: "Item Label"; font: "Edje-Vera"; @@ -1018,6 +1019,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "ilist_item_odd"; text { text: "Item Label"; font: "Edje-Vera"; @@ -1692,6 +1694,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "ilist_item"; text { text: "Item Label"; font: "Edje-Vera"; @@ -2367,6 +2370,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "ilist_item_odd"; text { text: "Item Label"; font: "Edje-Vera"; @@ -2779,6 +2783,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "label_text"; text { text: "No Title"; size: 10; @@ -2887,6 +2892,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "label_text"; text { text: "No Title"; size: 10; === RCS file: /cvs/e/e17/apps/e/data/themes/default_label.edc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- default_label.edc 23 Aug 2006 03:39:01 - 1.6 +++ default_label.edc 10 Oct 2006 11:02:08 - 1.7 @@ -18,6 +18,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "label_text"; text { text: "Label"; font: "Edje-Vera"; === RCS file: /cvs/e/e17/apps/e/data/themes/default_move.edc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- default_move.edc23 Aug 2006 03:39:01 - 1.5 +++ default_move.edc10 Oct 2006 11:02:08 - 1.6 @@ -85,6 +85,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "move_text"; text { text: "X Y"; font: "Edje-Vera"; === RCS file: /cvs/e/e17/apps/e/data/themes/default_pager.edc,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- default_pager.edc 23 Aug 2006 03:39:01 - 1.30 +++ default_pager.edc 10 Oct 2006 11:02:08 - 1.31 @@ -114,6 +114,7 @@ } color: 0 0 0 255; color3: 0 0 0 22; + color_class: "pager_label"; text { text: "Title goes here"; font: "Edje-Vera-Bold"; === RCS file: /cvs/e/e17/apps/e/data/themes/default_resize.edc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- default_resize.edc 23 Aug 2006 03:39:01 - 1.7 +++ default_resize.edc 10 Oct 2006 11:02:08 - 1.8 @@ -85,6 +85,7 @@ } color: 0 0 0 255; color3: 255 255 255 128; + color_class: "resize_text"; text { text: "WIDTHxHEIGHT"; font: "Edje-Vera"; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_configure.c Log Message: Color class dialog goes live. There is an issue with setting shadow colors. Perhaps someone more familiar with cc's can also have a look ? === RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -3 -r1.63 -r1.64 --- e_configure.c 10 Oct 2006 03:57:06 - 1.63 +++ e_configure.c 10 Oct 2006 10:42:34 - 1.64 @@ -92,7 +92,7 @@ e_configure_standard_item_add(eco, "enlightenment/background", _("Wallpaper"), e_int_config_wallpaper); e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme"), e_int_config_theme); e_configure_standard_item_add(eco, "enlightenment/fonts", _("Fonts"), e_int_config_fonts); - //e_configure_standard_item_add(eco, "enlightenment/themes", _("Colors"), e_int_config_color_classes); + e_configure_standard_item_add(eco, "enlightenment/themes", _("Colors"), e_int_config_color_classes); e_configure_standard_item_add(eco, "enlightenment/icon_themes", _("Icon Theme"), e_int_config_icon_themes); e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse Cursor"), e_int_config_cursor); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display"), e_int_config_window_display); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_color_classes.c Log Message: As per Nathan's suggestion, rework the Basic mode into something much simplier. Numerous fixes for Advanced mode. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_color_classes.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_int_config_color_classes.c8 Oct 2006 08:04:17 - 1.14 +++ e_int_config_color_classes.c10 Oct 2006 10:40:56 - 1.15 @@ -3,21 +3,6 @@ typedef struct _CFColor_Class CFColor_Class; typedef struct _CFColor_Hash CFColor_Hash; -static void*_create_data (E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _adv_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_adv_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); - -static void _load_color_classes (Evas_Object *obj, E_Config_Dialog_Data *cfdata); -static void _radio_cb_change (void *data, Evas_Object *obj, void *event_info); -static void _list_cb_change (void *data, Evas_Object *obj); -static void _update_colors(E_Config_Dialog_Data *cfdata, CFColor_Class *cc); -static void _color1_cb_change (void *data, Evas_Object *obj); -static void _color2_cb_change (void *data, Evas_Object *obj); -static void _color3_cb_change (void *data, Evas_Object *obj); - struct _CFColor_Hash { const char *key; @@ -39,6 +24,7 @@ { char *cur_class; int state; + int wm_enabled, wid_enabled, mod_enabled; E_Color *color1, *color2, *color3; Evas_List *classes; struct @@ -53,7 +39,7 @@ * * These can/should be changed to "official" key/names */ -const CFColor_Hash _color_hash[] = +const CFColor_Hash _wm_hash[] = { {NULL, N_("Window Manager")}, {"about_title",N_("About Dialog Title")}, @@ -64,7 +50,11 @@ {"menu_title", N_("Menu Title")}, {"menu_title_active", N_("Menu Title Active")}, {"menu_item", N_("Menu Item")}, + {NULL, NULL} +}; +const CFColor_Hash _wid_hash[] = +{ {NULL, N_("Widgets")}, {"button_text", N_("Button Text")}, {"button_text_disabled", N_("Button Text Disabled")}, @@ -78,7 +68,11 @@ {"radio_text_disabled", N_("Radio Text Disabled")}, {"slider_text", N_("Slider Text")}, {"slider_text_disabled", N_("Slider Text Disabled")}, + {NULL, NULL} +}; +const CFColor_Hash _mod_hash[] = +{ {NULL, N_("Modules")}, {"battery_label", N_("Battery Label")}, {"cpufreq_label", N_("Cpufreq Label")}, @@ -88,6 +82,25 @@ {NULL, NULL} }; +static void*_create_data (E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _adv_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_adv_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); + +static void _fill_data_hash (E_Config_Dialog_Data *cfdata, const CFColor_Hash *cfhash); +static void _fill_data_basic (E_Config_Dialog_Data *cfdata); +static void _fill_data_adv(E_Config_Dialog_Data *cfdata); + +static void _load_color_classes (Evas_Object *obj, E_Config_Dialog_Data *cfdata); +static void _radio_cb_change (void *data, Evas_Object *obj, void *event_info); +static void _list_cb_change (void *data, Evas_Object *obj); +static void _update_colors(E_Config_Dialog_Data *cfdata, CFColor_Class *cc); +static void _color1_cb_change (void *data, Evas_Object *obj); +static void _color2_cb_change (void *data, Evas_Object *obj); +static void _color3_cb_change (void *data, Evas_Object *obj); + EAPI E_Config_Dialog * e_int_config_color_classes(E_Container *con) { @@ -113,15 +126,23 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { - Evas_List *l, *cclist; - Evas_Hash *color_hash; - int i = 0; - - cclist = edje_color_class_list(); cfdata->cur_class = NULL; cfdata->state = 0; - - for (i = 0; _color_has