From: <enl...@li...> - 2004-08-18 04:27:09
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: Makefile.am ewl_theme.c ewl_theme.h Log Message: - remove edb theme support from ewl. its just edje themes now. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Makefile.am,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- Makefile.am 30 Jul 2004 19:44:23 -0000 1.61 +++ Makefile.am 18 Aug 2004 04:27:03 -0000 1.62 @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Ewl.h -INCLUDES = @edje_cflags@ @ecore_cflags@ @edb_cflags@ @evas_cflags@ @etox_cflags@ @emotion_cflags@ +INCLUDES = @edje_cflags@ @ecore_cflags@ @evas_cflags@ @etox_cflags@ @emotion_cflags@ lib_LTLIBRARIES = libewl.la @@ -131,5 +131,5 @@ installed_headersdir = $(prefix)/include/ewl installed_headers_DATA = $(EWLHEADERS) $(EWLEMOTIONHEADERS) -libewl_la_LIBADD = @edje_libs@ @ecore_libs@ @edb_libs@ @evas_libs@ @etox_libs@ @emotion_libs@ -lm +libewl_la_LIBADD = @edje_libs@ @ecore_libs@ @evas_libs@ @etox_libs@ @emotion_libs@ -lm libewl_la_LDFLAGS = -version-info 0:0:0 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -3 -r1.66 -r1.67 --- ewl_theme.c 18 Aug 2004 03:04:32 -0000 1.66 +++ ewl_theme.c 18 Aug 2004 04:27:03 -0000 1.67 @@ -7,8 +7,6 @@ static char *theme_name = NULL; static char *theme_path = NULL; -static E_DB_File *theme_db = NULL; - static Ecore_List *font_paths = NULL; static Ecore_Hash *cached_theme_data = NULL; static Ecore_Hash *def_theme_data = NULL; @@ -64,61 +62,18 @@ /* * Build a path to the theme if it is the users home dir and use it if - * available. First attempts to use the theme.db method, but fails - * over to an eet. + * available. */ - snprintf(theme_db_path, PATH_MAX, "%s/.e/ewl/themes/%s", home, - theme_name); - - if (((stat(theme_db_path, &st)) == 0) && S_ISDIR(st.st_mode)) { - snprintf(theme_db_path, PATH_MAX, - "%s/.e/ewl/themes/%s/theme.db", home, - theme_name); - theme_db = e_db_open_read(theme_db_path); - if (theme_db) { - snprintf(theme_db_path, PATH_MAX, - "%s/.e/ewl/themes/%s/", home, - theme_name); - theme_path = strdup(theme_db_path); - } - } - - if (!theme_path) { - snprintf(theme_db_path, PATH_MAX, "%s/.e/ewl/themes/%s.eet", - home, theme_name); - if (((stat(theme_db_path, &st)) == 0) && S_ISREG(st.st_mode)) { - theme_path = strdup(theme_db_path); - } + snprintf(theme_db_path, PATH_MAX, "%s/.e/ewl/themes/%s.eet", + home, theme_name); + if (((stat(theme_db_path, &st)) == 0) && S_ISREG(st.st_mode)) { + theme_path = strdup(theme_db_path); } /* - * No user theme, so we try the system-wide theme. Same failover - * scheme, theme.db first fails over to the eet. + * No user theme, so we try the system-wide theme. */ if (!theme_path) { - - /* - * Theme dir is ok, now get the specified theme's path - */ - snprintf(theme_db_path, PATH_MAX, PACKAGE_DATA_DIR - "/themes/%s", theme_name); - - if (((stat(theme_db_path, &st)) == 0) && S_ISDIR(st.st_mode)) { - snprintf(theme_db_path, PATH_MAX, PACKAGE_DATA_DIR - "/themes/%s/theme.db", theme_name); - - theme_db = e_db_open_read(theme_db_path); - if (theme_db) { - snprintf(theme_db_path, PATH_MAX, - PACKAGE_DATA_DIR "/themes/%s", - theme_name); - theme_path = strdup(theme_db_path); - } - } - - } - - if (!theme_path) { snprintf(theme_db_path, PATH_MAX, PACKAGE_DATA_DIR "/themes/%s.eet", theme_name); if (((stat(theme_db_path, &st)) == 0) && @@ -169,11 +124,6 @@ { char *data; - if (theme_db) { - e_db_close(theme_db); - theme_db = NULL; - } - if (font_paths) { while ((data = ecore_list_remove_first(font_paths))) free(data); @@ -297,16 +247,6 @@ } /** - * @brief Returns the open theme db file handle. - * @return Returns the open theme database on success, NULL for an eet theme. - */ -E_DB_File *ewl_theme_db_get() -{ - DENTER_FUNCTION(DLEVEL_STABLE); - DRETURN_PTR(theme_db, DLEVEL_STABLE); -} - -/** * @return Returns the font path of widget @a w on success, NULL on failure. * @brief retrieve the path of a widgets theme's fonts */ @@ -356,7 +296,7 @@ DCHECK_PARAM_PTR_RET("k", k, NULL); data = ewl_theme_data_str_get(w, k); - if (!data && !theme_db) + if (!data) data = strdup(theme_path); if (!data) @@ -415,10 +355,7 @@ ret = ecore_hash_get(cached_theme_data, temp); if (!ret) { - if (theme_db) - ret = e_db_str_get(theme_db, temp); - else - ret = edje_file_data_get(theme_path, temp); + ret = edje_file_data_get(theme_path, temp); if (ret && ewl_config.theme.cache) { if (!cached_theme_data) @@ -465,16 +402,12 @@ ret = (int) (ecore_hash_get(def_theme_data, temp)); if (!ret) { - if (theme_db) - e_db_int_get(theme_db, temp, &ret); - else { - char *val; + char *val; - val = edje_file_data_get(theme_path, temp); - if (val) { - ret = atoi(val); - FREE(val); - } + val = edje_file_data_get(theme_path, temp); + if (val) { + ret = atoi(val); + FREE(val); } } temp++; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- ewl_theme.h 18 Aug 2004 03:04:33 -0000 1.25 +++ ewl_theme.h 18 Aug 2004 04:27:03 -0000 1.26 @@ -36,7 +36,6 @@ void ewl_theme_name_set(char *name); char *ewl_theme_name_get(void); char *ewl_theme_path_get(void); -E_DB_File *ewl_theme_db_get(); Ecore_List *ewl_theme_font_path_get(void); void ewl_theme_font_path_add(char *path); char *ewl_theme_image_get(Ewl_Widget * w, char *k); |
From: <enl...@li...> - 2004-08-18 04:42:11
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/test Modified Files: ewl_button_test.c ewl_floater_test.c ewl_notebook_test.c Log Message: - breakage, ewl_check, ewl_checkbutton, ewl_radiobutton to the new api =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_button_test.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- ewl_button_test.c 18 Aug 2004 03:15:21 -0000 1.26 +++ ewl_button_test.c 18 Aug 2004 04:41:59 -0000 1.27 @@ -103,7 +103,7 @@ ewl_widget_show(radio_button[0]); radio_button[1] = ewl_radiobutton_new(NULL); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(radio_button[1]), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(radio_button[1]), EWL_RADIOBUTTON(radio_button[0])); ewl_container_child_append(EWL_CONTAINER(button_box), radio_button[1]); ewl_object_alignment_set(EWL_OBJECT(radio_button[1]), =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_floater_test.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ewl_floater_test.c 18 Aug 2004 03:15:22 -0000 1.12 +++ ewl_floater_test.c 18 Aug 2004 04:41:59 -0000 1.13 @@ -49,7 +49,7 @@ ewl_widget_show(radio_button[0]); radio_button[1] = ewl_radiobutton_new(NULL); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(radio_button[1]), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(radio_button[1]), EWL_RADIOBUTTON(radio_button[0])); ewl_container_child_append(EWL_CONTAINER(floater_box), radio_button[1]); ewl_object_alignment_set(EWL_OBJECT(radio_button[1]), =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_notebook_test.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- ewl_notebook_test.c 18 Aug 2004 03:15:22 -0000 1.24 +++ ewl_notebook_test.c 18 Aug 2004 04:41:59 -0000 1.25 @@ -108,25 +108,25 @@ ewl_widget_show(button_atop); button_aleft = ewl_radiobutton_new("Left"); - ewl_radiobutton_set_checked(button_aleft, 1); + ewl_radiobutton_checked_set(button_aleft, 1); ewl_container_child_append(EWL_CONTAINER(avbox), button_aleft); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(button_aleft), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_aleft), EWL_RADIOBUTTON(button_atop)); ewl_callback_append(button_aleft, EWL_CALLBACK_VALUE_CHANGED, __notebook_change_alignment, notebook); ewl_widget_show(button_aleft); button_acenter = ewl_radiobutton_new("Center"); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(button_acenter), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_acenter), EWL_RADIOBUTTON(button_aleft)); - ewl_radiobutton_set_checked(button_acenter, 1); + ewl_radiobutton_checked_set(button_acenter, 1); ewl_container_child_append(EWL_CONTAINER(avbox), button_acenter); ewl_callback_append(button_acenter, EWL_CALLBACK_VALUE_CHANGED, __notebook_change_alignment, notebook); ewl_widget_show(button_acenter); button_aright = ewl_radiobutton_new("Right"); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(button_aright), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_aright), EWL_RADIOBUTTON(button_acenter)); ewl_container_child_append(EWL_CONTAINER(avbox), button_aright); ewl_callback_append(button_aright, EWL_CALLBACK_VALUE_CHANGED, @@ -134,7 +134,7 @@ ewl_widget_show(button_aright); button_abottom = ewl_radiobutton_new("Bottom"); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(button_abottom), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_abottom), EWL_RADIOBUTTON(button_aright)); ewl_container_child_append(EWL_CONTAINER(avbox), button_abottom); ewl_callback_append(button_abottom, EWL_CALLBACK_VALUE_CHANGED, @@ -157,7 +157,7 @@ ewl_widget_show(button_pleft); button_pright = ewl_radiobutton_new("Right"); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(button_pright), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_pright), EWL_RADIOBUTTON(button_pleft)); ewl_container_child_append(EWL_CONTAINER(pvbox), button_pright); ewl_callback_append(button_pright, EWL_CALLBACK_VALUE_CHANGED, @@ -165,8 +165,8 @@ ewl_widget_show(button_pright); button_ptop = ewl_radiobutton_new("Top"); - ewl_radiobutton_set_checked(button_ptop, 1); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(button_ptop), + ewl_radiobutton_checked_set(button_ptop, 1); + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_ptop), EWL_RADIOBUTTON(button_pright)); ewl_container_child_append(EWL_CONTAINER(pvbox), button_ptop); ewl_callback_append(button_ptop, EWL_CALLBACK_VALUE_CHANGED, @@ -174,7 +174,7 @@ ewl_widget_show(button_ptop); button_pbottom = ewl_radiobutton_new("Bottom"); - ewl_radiobutton_set_chain(EWL_RADIOBUTTON(button_pbottom), + ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_pbottom), EWL_RADIOBUTTON(button_ptop)); ewl_container_child_append(EWL_CONTAINER(pvbox), button_pbottom); ewl_callback_append(button_pbottom, EWL_CALLBACK_VALUE_CHANGED, |
From: <enl...@li...> - 2004-08-18 04:42:11
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_check.c ewl_check.h ewl_checkbutton.c ewl_checkbutton.h ewl_radiobutton.c ewl_radiobutton.h Log Message: - breakage, ewl_check, ewl_checkbutton, ewl_radiobutton to the new api =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_check.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl_check.c 13 Aug 2004 00:41:12 -0000 1.14 +++ ewl_check.c 18 Aug 2004 04:41:59 -0000 1.15 @@ -31,7 +31,7 @@ * Changes the checked status of the check and updates it's appearance to * reflect the change. */ -void ewl_check_set_checked(Ewl_Check * cb, int c) +void ewl_check_checked_set(Ewl_Check * cb, int c) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("cb", cb); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_check.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ewl_check.h 25 Nov 2003 07:47:29 -0000 1.6 +++ ewl_check.h 18 Aug 2004 04:41:59 -0000 1.7 @@ -38,7 +38,7 @@ Ewl_Widget *ewl_check_new(void); void ewl_check_init(Ewl_Check * c); int ewl_check_is_checked(Ewl_Check * c); -void ewl_check_set_checked(Ewl_Check * c, int checked); +void ewl_check_checked_set(Ewl_Check * c, int checked); /* * Internally used callbacks. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_checkbutton.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- ewl_checkbutton.c 18 Aug 2004 03:15:20 -0000 1.42 +++ ewl_checkbutton.c 18 Aug 2004 04:41:59 -0000 1.43 @@ -69,7 +69,7 @@ * * Changes the position of the label associated with the check button. */ -void ewl_checkbutton_set_label_position(Ewl_Widget * w, Ewl_Position p) +void ewl_checkbutton_label_position_set(Ewl_Widget * w, Ewl_Position p) { Ewl_Button *b; Ewl_CheckButton *cb; @@ -117,9 +117,9 @@ cb = EWL_CHECKBUTTON(w); if (ewl_check_is_checked(EWL_CHECK(cb->check))) - ewl_check_set_checked(EWL_CHECK(cb->check), FALSE); + ewl_check_checked_set(EWL_CHECK(cb->check), FALSE); else - ewl_check_set_checked(EWL_CHECK(cb->check), TRUE); + ewl_check_checked_set(EWL_CHECK(cb->check), TRUE); ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED); DLEAVE_FUNCTION(DLEVEL_STABLE); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_checkbutton.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ewl_checkbutton.h 15 May 2004 13:48:04 -0000 1.19 +++ ewl_checkbutton.h 18 Aug 2004 04:41:59 -0000 1.20 @@ -49,8 +49,8 @@ * Shortcut for dereferencing the checkbutton to update the checked state of * the Ewl_Check. */ -#define ewl_checkbutton_set_checked(cb, c) \ - ewl_check_set_checked(EWL_CHECK(EWL_CHECKBUTTON(cb)->check), c) +#define ewl_checkbutton_checked_set(cb, c) \ + ewl_check_checked_set(EWL_CHECK(EWL_CHECKBUTTON(cb)->check), c) /** * @def ewl_checkbutton_is_checked(cb); @@ -60,7 +60,7 @@ #define ewl_checkbutton_is_checked(cb) \ ewl_check_is_checked(EWL_CHECK(EWL_CHECKBUTTON(cb)->check)) -void ewl_checkbutton_set_label_position(Ewl_Widget * w, +void ewl_checkbutton_label_position_set(Ewl_Widget * w, Ewl_Position p); void ewl_checkbutton_clicked_cb(Ewl_Widget * w, void *ev_data, =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_radiobutton.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- ewl_radiobutton.c 13 Aug 2004 00:41:13 -0000 1.33 +++ ewl_radiobutton.c 18 Aug 2004 04:41:59 -0000 1.34 @@ -30,7 +30,7 @@ * Associates @a w with the same chain as @a c, in order to * ensure that only one radio button of that group is checked at any time. */ -void ewl_radiobutton_set_chain(Ewl_RadioButton *rb, Ewl_RadioButton *crb) +void ewl_radiobutton_chain_set(Ewl_RadioButton *rb, Ewl_RadioButton *crb) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("rb", rb); @@ -104,11 +104,11 @@ ecore_list_goto_first(rb->chain); while ((c = ecore_list_next(rb->chain)) != NULL) { - ewl_checkbutton_set_checked(c, 0); + ewl_checkbutton_checked_set(c, 0); } } - ewl_checkbutton_set_checked(cb, 1); + ewl_checkbutton_checked_set(cb, 1); if (oc != ewl_checkbutton_is_checked(cb)) ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_radiobutton.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_radiobutton.h 24 Mar 2004 04:11:09 -0000 1.17 +++ ewl_radiobutton.h 18 Aug 2004 04:41:59 -0000 1.18 @@ -44,8 +44,8 @@ * Shortcut for setting the checked status on the inherited Ewl_CheckButton * fields. */ -#define ewl_radiobutton_set_checked(r, c) \ - ewl_checkbutton_set_checked(EWL_CHECKBUTTON(r), c) +#define ewl_radiobutton_checked_set(r, c) \ + ewl_checkbutton_checked_set(EWL_CHECKBUTTON(r), c) /** * @def ewl_radiobutton_set_checked(r, c) @@ -54,7 +54,7 @@ */ #define ewl_radiobutton_is_checked(r) \ ewl_checkbutton_is_checked(EWL_CHECKBUTTON(r)) -void ewl_radiobutton_set_chain(Ewl_RadioButton * w, Ewl_RadioButton * c); +void ewl_radiobutton_chain_set(Ewl_RadioButton * w, Ewl_RadioButton * c); /* * Internally used callbacks, override at your own risk. |
From: <enl...@li...> - 2004-08-18 04:55:17
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_config.c ewl_config.h ewl_theme.c ewl_window.c Log Message: break ewl_config api =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- ewl_config.c 26 Jul 2004 15:10:01 -0000 1.36 +++ ewl_config.c 18 Aug 2004 04:55:04 -0000 1.37 @@ -18,8 +18,8 @@ extern Ecore_List *ewl_embed_list; -static void ewl_config_set_defaults(void); -static void ewl_config_read_config(void); +static void ewl_config_defaults_set(void); +static void ewl_config_config_read(void); static int ewl_config_listener(const char *key, const Ecore_Config_Type type, const int tag, void *data); @@ -38,7 +38,7 @@ ecore_config_system_init(); memset(&ewl_config, 0, sizeof(Ewl_Config)); - ewl_config_read_config(); + ewl_config_config_read(); DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -60,7 +60,7 @@ * Sets the string value associated with the key @a k to @a v in the * configuration database. */ -int ewl_config_set_str(const char *k, char *v) +int ewl_config_str_set(const char *k, char *v) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -78,7 +78,7 @@ * Sets the integer value associated with the key @a k to @a v in the * configuration database. */ -int ewl_config_set_int(const char *k, int v) +int ewl_config_int_set(const char *k, int v) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -97,7 +97,7 @@ * Sets the float value associated with the key @a k to @a v in the * configuration database. */ -int ewl_config_set_float(const char *k, float v) +int ewl_config_float_set(const char *k, float v) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -112,7 +112,7 @@ * @return Returns the found string value on success, NULL on failure. * @brief Retrieve string value associated with a key */ -char *ewl_config_get_str(const char *k) +char *ewl_config_str_get(const char *k) { char *ret = NULL; @@ -129,7 +129,7 @@ * @return Returns the found integer value on success, 0 on failure. * @brief Retrieve integer value associated with a key */ -int ewl_config_get_int(const char *k) +int ewl_config_int_get(const char *k) { int v = 0; @@ -145,7 +145,7 @@ * @return Returns the found float value on success, 0.0 on failure. * @brief Retrieve floating point value associated with a key */ -float ewl_config_get_float(const char *k) +float ewl_config_float_get(const char *k) { float v = 0.0; @@ -160,7 +160,7 @@ * @return Returns the found render method, default software render. * @brief Retrieve the render method of the evas */ -char *ewl_config_get_render_method() +char *ewl_config_render_method_get() { DENTER_FUNCTION(DLEVEL_STABLE); @@ -169,7 +169,7 @@ DLEVEL_STABLE); } -static void ewl_config_read_config(void) +static void ewl_config_config_read(void) { int cc; Ewl_Config nc; @@ -184,22 +184,22 @@ IF_FREE(ewl_config.evas.render_method); IF_FREE(ewl_config.theme.name); - ewl_config_set_defaults(); + ewl_config_defaults_set(); - nc.debug.enable = ewl_config_get_int("/ewl/debug/enable"); - nc.debug.level = ewl_config_get_int("/ewl/debug/level"); - nc.evas.font_cache = ewl_config_get_int("/ewl/evas/font_cache"); - nc.evas.image_cache = ewl_config_get_int("/ewl/evas/image_cache"); - nc.evas.render_method = ewl_config_get_str("/ewl/evas/render_method"); - nc.theme.name = ewl_config_get_str("/ewl/theme/name"); - nc.theme.cache = ewl_config_get_int("/ewl/theme/cache"); + nc.debug.enable = ewl_config_int_get("/ewl/debug/enable"); + nc.debug.level = ewl_config_int_get("/ewl/debug/level"); + nc.evas.font_cache = ewl_config_int_get("/ewl/evas/font_cache"); + nc.evas.image_cache = ewl_config_int_get("/ewl/evas/image_cache"); + nc.evas.render_method = ewl_config_str_get("/ewl/evas/render_method"); + nc.theme.name = ewl_config_str_get("/ewl/theme/name"); + nc.theme.cache = ewl_config_int_get("/ewl/theme/cache"); nc.theme.cclass_override = - ewl_config_get_int("/ewl/theme/color_classes/override"); + ewl_config_int_get("/ewl/theme/color_classes/override"); if (nc.theme.cclass_override) { int i; - cc = ewl_config_get_int("/ewl/theme/color_classes/count"); + cc = ewl_config_int_get("/ewl/theme/color_classes/count"); prop = ecore_config_get("/ewl/theme/color_classes/count"); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; @@ -210,7 +210,7 @@ snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/name", i); - name = ewl_config_get_str(key); + name = ewl_config_str_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; @@ -222,84 +222,84 @@ snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/r", i); - r = ewl_config_get_int(key); + r = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/g", i); - g = ewl_config_get_int(key); + g = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/b", i); - b = ewl_config_get_int(key); + b = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/a", i); - a = ewl_config_get_int(key); + a = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/r2", i); - r2 = ewl_config_get_int(key); + r2 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/g2", i); - g2 = ewl_config_get_int(key); + g2 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/b2", i); - b2 = ewl_config_get_int(key); + b2 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/a2", i); - a2 = ewl_config_get_int(key); + a2 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/r3", i); - r3 = ewl_config_get_int(key); + r3 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/g3", i); - g3 = ewl_config_get_int(key); + g3 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/b3", i); - b3 = ewl_config_get_int(key); + b3 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; snprintf(key, PATH_MAX, "/ewl/theme/color_classes/%d/a3", i); - a3 = ewl_config_get_int(key); + a3 = ewl_config_int_get(key); prop = ecore_config_get(key); prop->flags &= ~PF_MODIFIED; prop->flags |= PF_SYSTEM; @@ -346,7 +346,7 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } -static void ewl_config_set_defaults(void) +static void ewl_config_defaults_set(void) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -407,37 +407,37 @@ { switch(tag) { case EWL_CONFIG_DEBUG_ENABLE: - ewl_config.debug.enable = ewl_config_get_int(key); + ewl_config.debug.enable = ewl_config_int_get(key); break; case EWL_CONFIG_DEBUG_LEVEL: - ewl_config.debug.level = ewl_config_get_int(key); + ewl_config.debug.level = ewl_config_int_get(key); break; case EWL_CONFIG_EVAS_RENDER_METHOD: IF_FREE(ewl_config.evas.render_method); - ewl_config.evas.render_method = ewl_config_get_str(key); + ewl_config.evas.render_method = ewl_config_str_get(key); break; case EWL_CONFIG_EVAS_FONT_CACHE: - ewl_config.evas.font_cache = ewl_config_get_int(key); + ewl_config.evas.font_cache = ewl_config_int_get(key); break; case EWL_CONFIG_EVAS_IMAGE_CACHE: - ewl_config.evas.image_cache = ewl_config_get_int(key); + ewl_config.evas.image_cache = ewl_config_int_get(key); break; case EWL_CONFIG_THEME_NAME: IF_FREE(ewl_config.theme.name); - ewl_config.theme.name = ewl_config_get_str(key); + ewl_config.theme.name = ewl_config_str_get(key); break; case EWL_CONFIG_THEME_CACHE: - ewl_config.theme.cache = ewl_config_get_int(key); + ewl_config.theme.cache = ewl_config_int_get(key); break; case EWL_CONFIG_THEME_COLOR_CLASSES_OVERRIDE: - ewl_config.theme.cclass_override = ewl_config_get_int(key); + ewl_config.theme.cclass_override = ewl_config_int_get(key); break; } return 0; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- ewl_config.h 26 Jul 2004 15:10:01 -0000 1.27 +++ ewl_config.h 18 Aug 2004 04:55:05 -0000 1.28 @@ -32,13 +32,13 @@ int ewl_config_init(void); void ewl_config_shutdown(void); -int ewl_config_set_str(const char *k, char *v); -int ewl_config_set_int(const char *k, int v); -int ewl_config_set_float(const char *k, float v); -char *ewl_config_get_str(const char *k); -int ewl_config_get_int(const char *k); -float ewl_config_get_float(const char *k); -char * ewl_config_get_render_method(void); +int ewl_config_str_set(const char *k, char *v); +int ewl_config_int_set(const char *k, int v); +int ewl_config_float_set(const char *k, float v); +char *ewl_config_str_get(const char *k); +int ewl_config_int_get(const char *k); +float ewl_config_float_get(const char *k); +char * ewl_config_render_method_get(void); /** * @} =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- ewl_theme.c 18 Aug 2004 04:27:03 -0000 1.67 +++ ewl_theme.c 18 Aug 2004 04:55:05 -0000 1.68 @@ -40,7 +40,7 @@ * Retrieve the current theme from the users config. */ if (!theme_name) { - theme_name = ewl_config_get_str("/ewl/theme/name"); + theme_name = ewl_config_str_get("/ewl/theme/name"); if (!theme_name) theme_name = strdup("default"); } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -3 -r1.86 -r1.87 --- ewl_window.c 18 Aug 2004 02:28:55 -0000 1.86 +++ ewl_window.c 18 Aug 2004 04:55:05 -0000 1.87 @@ -351,7 +351,7 @@ /* * Determine the type of evas to create. */ - render = ewl_config_get_render_method(); + render = ewl_config_render_method_get(); if (!render) render = strdup("software_x11"); |
From: <enl...@li...> - 2004-08-22 19:34:01
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/zero added to the repository |
From: <enl...@li...> - 2004-08-22 19:35:11
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero/fonts Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/zero/fonts added to the repository |
From: <enl...@li...> - 2004-08-22 19:35:20
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero/bits Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/zero/bits added to the repository |
From: <enl...@li...> - 2004-08-22 19:35:56
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero/bits/images Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/zero/bits/images added to the repository |
From: <enl...@li...> - 2004-08-22 19:37:53
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero Added Files: NOTE README Log Message: - add a new theme, zero. - you will need to copy the zerofonts/vio.ttf into your etox/fonts directory for this theme to work correclty as the font is not currently pulled from the .eet |
From: <enl...@li...> - 2004-08-22 19:37:55
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero/bits/images Added Files: arrow-down.png arrow-left.png arrow-right.png arrow-up.png check.png circle.png dot.png stock-apply.png stock-cancel.png stock-ff.png stock-fr.png stock-ok.png stock-open.png stock-pause.png stock-play.png stock-quit.png stock-save.png stock-stop.png Log Message: - add a new theme, zero. - you will need to copy the zerofonts/vio.ttf into your etox/fonts directory for this theme to work correclty as the font is not currently pulled from the .eet |
From: <enl...@li...> - 2004-08-22 19:37:57
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero/bits Added Files: arrow-macro.edc button-groups.edc button-macro.edc checkbox-groups.edc checkbox-programs.edc entry-groups.edc filedialog-groups.edc images.edc line-macro.edc menu-groups.edc menu-macro.edc misc-groups.edc progressbar-groups.edc radio-groups.edc radio-programs.edc scrollbar-groups.edc scrollbar-images.edc spinner-groups.edc stock-groups.edc stock-images.edc tree-groups.edc tree-programs.edc window-groups.edc Log Message: - add a new theme, zero. - you will need to copy the zerofonts/vio.ttf into your etox/fonts directory for this theme to work correclty as the font is not currently pulled from the .eet |
From: <enl...@li...> - 2004-08-22 19:37:57
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/zero/fonts Added Files: Vera.ttf vio.ttf Log Message: - add a new theme, zero. - you will need to copy the zerofonts/vio.ttf into your etox/fonts directory for this theme to work correclty as the font is not currently pulled from the .eet |
From: <enl...@li...> - 2004-08-22 19:38:10
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes Modified Files: .cvsignore Makefile.am Added Files: zero.edc Log Message: - add a new theme, zero. - you will need to copy the zerofonts/vio.ttf into your etox/fonts directory for this theme to work correclty as the font is not currently pulled from the .eet =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 29 Jan 2004 11:14:01 -0000 1.2 +++ .cvsignore 22 Aug 2004 19:37:43 -0000 1.3 @@ -2,3 +2,4 @@ Makefile default.eet skeleton.eet +zero.eet =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 23 Jul 2004 18:45:43 -0000 1.10 +++ Makefile.am 22 Aug 2004 19:37:43 -0000 1.11 @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -EDCS = default.edc skeleton.edc +EDCS = default.edc skeleton.edc zero.edc EETS = $(EDCS:%.edc=%.eet) |
From: <enl...@li...> - 2004-08-23 00:10:25
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_progressbar.c ewl_progressbar.h Log Message: api breakage, update ewl_progressbar to efl type api =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_progressbar.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_progressbar.c 18 Aug 2004 03:15:20 -0000 1.13 +++ ewl_progressbar.c 23 Aug 2004 00:10:14 -0000 1.14 @@ -74,7 +74,7 @@ * @return Returns no value. * @brief Set the value of the progressbars location */ -void ewl_progressbar_set_value(Ewl_Progressbar * p, double v) +void ewl_progressbar_value_set(Ewl_Progressbar * p, double v) { char c[10]; @@ -109,7 +109,7 @@ * @return Returns 0 on failure, the value of the progressbars location on success. * @brief Retrieve the current value of the progressbars */ -double ewl_progressbar_get_value(Ewl_Progressbar * p) +double ewl_progressbar_value_get(Ewl_Progressbar * p) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("p", p, -1); @@ -123,7 +123,7 @@ * @return Returns no value. * @brief Set the range of the progressbar. Cannot be less then 1. */ -void ewl_progressbar_set_range (Ewl_Progressbar * p, double r) +void ewl_progressbar_range_set (Ewl_Progressbar * p, double r) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("p", p); @@ -147,7 +147,7 @@ * @return Returns 0 on failure, the value of the progressbars location on success. * @brief Retrieve the current range of the progressbars (default 100) */ -double ewl_progressbar_get_range (Ewl_Progressbar * p) +double ewl_progressbar_range_get (Ewl_Progressbar * p) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("p", p, -1); @@ -162,7 +162,7 @@ * @return Returns no value * @brief Sets the given text on the progressbar */ -void ewl_progressbar_set_label (Ewl_Progressbar * p, char *label) +void ewl_progressbar_label_set (Ewl_Progressbar * p, char *label) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("p", p); @@ -181,7 +181,7 @@ * @return Returns no value * @brief Sets the given format string on the progressbar (%lf of %lf beers) */ -void ewl_progressbar_set_custom_label (Ewl_Progressbar * p, char *format_string) +void ewl_progressbar_custom_label_set (Ewl_Progressbar * p, char *format_string) { char label[PATH_MAX]; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_progressbar.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ewl_progressbar.h 18 Mar 2004 03:41:23 -0000 1.7 +++ ewl_progressbar.h 23 Aug 2004 00:10:14 -0000 1.8 @@ -45,14 +45,14 @@ Ewl_Widget *ewl_progressbar_new(void); void ewl_progressbar_init (Ewl_Progressbar * p); -void ewl_progressbar_set_value (Ewl_Progressbar * p, double v); -double ewl_progressbar_get_value (Ewl_Progressbar * p); +void ewl_progressbar_value_set (Ewl_Progressbar * p, double v); +double ewl_progressbar_value_get (Ewl_Progressbar * p); -void ewl_progressbar_set_range (Ewl_Progressbar * p, double r); -double ewl_progressbar_get_range (Ewl_Progressbar * p); +void ewl_progressbar_range_set (Ewl_Progressbar * p, double r); +double ewl_progressbar_range_get (Ewl_Progressbar * p); -void ewl_progressbar_set_label (Ewl_Progressbar * p, char *label); -void ewl_progressbar_set_custom_label (Ewl_Progressbar * p, char *format_string); +void ewl_progressbar_label_set (Ewl_Progressbar * p, char *label); +void ewl_progressbar_custom_label_set (Ewl_Progressbar * p, char *format_string); void ewl_progressbar_label_show (Ewl_Progressbar * p); void ewl_progressbar_label_hide (Ewl_Progressbar * p); |
From: <enl...@li...> - 2004-08-23 00:10:25
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/test Modified Files: ewl_progressbar_test.c Log Message: api breakage, update ewl_progressbar to efl type api =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_progressbar_test.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_progressbar_test.c 19 Aug 2004 20:03:34 -0000 1.13 +++ ewl_progressbar_test.c 23 Aug 2004 00:10:14 -0000 1.14 @@ -17,7 +17,7 @@ int i; Ewl_Progressbar *p = EWL_PROGRESSBAR(data); - val = ewl_progressbar_get_value(p); + val = ewl_progressbar_value_get(p); if (val >= p->range) { for (i = 0; i < 3; i++) { @@ -30,20 +30,20 @@ } val += 1; - ewl_progressbar_set_value(p, val); + ewl_progressbar_value_set(p, val); if (val >= 20 && val < 35 ) { - ewl_progressbar_set_custom_label (p, + ewl_progressbar_custom_label_set (p, "%.0lf / %.0lf kbytes"); } if (val >= 35 && val < 60) { - value = ewl_progressbar_get_value (p); - range = ewl_progressbar_get_range (p); + value = ewl_progressbar_value_get (p); + range = ewl_progressbar_range_get (p); snprintf (c, sizeof (c), "%.0lf of %.0lf beers", value, range); - ewl_progressbar_set_label (p, c); + ewl_progressbar_label_set (p, c); } if (val == 60) @@ -84,9 +84,9 @@ printf ("New random value: %d\n", j); for (i = 0; i < 3; i++) { - ewl_progressbar_set_range (EWL_PROGRESSBAR (progressbar[i]), j); + ewl_progressbar_range_set (EWL_PROGRESSBAR (progressbar[i]), j); - if (ewl_progressbar_get_value (EWL_PROGRESSBAR (progressbar[i])) >= j) + if (ewl_progressbar_value_get (EWL_PROGRESSBAR (progressbar[i])) >= j) __rerun_progressbars (EWL_WIDGET (progressbar[i]), NULL, NULL); } @@ -107,7 +107,7 @@ * (since the auto label is turned off when you label manually) */ ewl_progressbar_label_show (EWL_PROGRESSBAR (progressbar[i])); - ewl_progressbar_set_value (EWL_PROGRESSBAR (progressbar[i]), 0); + ewl_progressbar_value_set (EWL_PROGRESSBAR (progressbar[i]), 0); if (progress_timer[i]) { ecore_timer_del(progress_timer[i]); @@ -162,7 +162,7 @@ */ for (i = 0; i < 2; i++) { progressbar[i] = ewl_progressbar_new(); - ewl_progressbar_set_value (EWL_PROGRESSBAR(progressbar[i]), 0); + ewl_progressbar_value_set (EWL_PROGRESSBAR(progressbar[i]), 0); ewl_widget_show (progressbar[i]); progress_timer[i] = ecore_timer_add(0.1, __increment_progress, @@ -176,7 +176,7 @@ * Third big progressbar */ progressbar[2] = ewl_progressbar_new(); - ewl_progressbar_set_value (EWL_PROGRESSBAR(progressbar[2]), 0); + ewl_progressbar_value_set (EWL_PROGRESSBAR(progressbar[2]), 0); ewl_widget_show (progressbar[2]); progress_timer[2] = ecore_timer_add(0.1, __increment_progress, |
From: <enl...@li...> - 2004-08-23 00:19:10
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/test Modified Files: ewl_password_test.c Log Message: api breakage, ewl_password this time =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_password_test.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ewl_password_test.c 19 Aug 2004 20:03:34 -0000 1.6 +++ ewl_password_test.c 23 Aug 2004 00:18:59 -0000 1.7 @@ -21,11 +21,11 @@ { char *s; - s = ewl_password_get_text(EWL_PASSWORD(password[0])); + s = ewl_password_text_get(EWL_PASSWORD(password[0])); printf("First password covers: %s\n", s); FREE(s); - s = ewl_password_get_text(EWL_PASSWORD(password[1])); + s = ewl_password_text_get(EWL_PASSWORD(password[1])); printf("Second password covers: %s\n", s); FREE(s); @@ -39,8 +39,8 @@ void __set_password_text(Ewl_Widget * w, void *ev_data, void *user_data) { - ewl_password_set_text(EWL_PASSWORD(password[0]), "Play with me ?"); - ewl_password_set_text(EWL_PASSWORD(password[1]), "E W L ! ! !"); + ewl_password_text_set(EWL_PASSWORD(password[0]), "Play with me ?"); + ewl_password_text_set(EWL_PASSWORD(password[1]), "E W L ! ! !"); return; w = NULL; |
From: <enl...@li...> - 2004-08-23 00:19:11
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_password.c ewl_password.h Log Message: api breakage, ewl_password this time =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_password.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_password.c 28 May 2004 19:55:15 -0000 1.8 +++ ewl_password.c 23 Aug 2004 00:18:59 -0000 1.9 @@ -53,7 +53,7 @@ ewl_callback_append(w, EWL_CALLBACK_DESTROY, ewl_password_destroy, NULL); - ewl_password_set_text(e, text); + ewl_password_text_set(e, text); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -66,7 +66,7 @@ * * Change the text of the password widget @a e to the string @a t. */ -void ewl_password_set_text(Ewl_Password * e, char *t) +void ewl_password_text_set(Ewl_Password * e, char *t) { char *vis = NULL; int len; @@ -101,7 +101,7 @@ * @return Returns the password text on success, NULL on failure. * @brief Get the text from an password widget */ -char *ewl_password_get_text(Ewl_Password * e) +char *ewl_password_text_get(Ewl_Password * e) { Ewl_Widget *w; @@ -119,7 +119,7 @@ * @return Returns the character value of the obscuring character. * @brief Retrieves the character used to obscure the text for a password. */ -char ewl_password_get_obscure(Ewl_Password * e) +char ewl_password_obscure_get(Ewl_Password * e) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("e", e, 0); @@ -133,7 +133,7 @@ * @return Returns no value. * @brief Sets the character used to obscure the text for a password. */ -void ewl_password_set_obscure(Ewl_Password * e, char o) +void ewl_password_obscure_set(Ewl_Password * e, char o) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("e", e); @@ -143,7 +143,7 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } -void ewl_password_insert_text(Ewl_Password * e, char *s) +void ewl_password_text_insert(Ewl_Password * e, char *s) { char *s2, *s3; int l = 0, l2 = 0; @@ -151,7 +151,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("e", e); - s2 = ewl_password_get_text(e); + s2 = ewl_password_text_get(e); if (s) l = strlen(s); if (s2) @@ -169,7 +169,7 @@ if (s) strcat(s3, s); - ewl_password_set_text(e, s3); + ewl_password_text_set(e, s3); IF_FREE(s2); FREE(s3); @@ -211,7 +211,7 @@ ewl_callback_call_with_event_data(w, EWL_CALLBACK_VALUE_CHANGED, EWL_TEXT(w)->text); else if (ev->keyname) { - ewl_password_insert_text(e, ev->keyname); + ewl_password_text_insert(e, ev->keyname); } DLEAVE_FUNCTION(DLEVEL_STABLE); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_password.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ewl_password.h 28 May 2004 19:55:15 -0000 1.3 +++ ewl_password.h 23 Aug 2004 00:18:59 -0000 1.4 @@ -37,12 +37,12 @@ Ewl_Widget *ewl_password_new(char *text); void ewl_password_init(Ewl_Password * e, char *text); -void ewl_password_set_text(Ewl_Password * e, char *t); -char *ewl_password_get_text(Ewl_Password * e); -void ewl_password_set_obscure(Ewl_Password * e, char o); -char ewl_password_get_obscure(Ewl_Password * e); +void ewl_password_text_set(Ewl_Password * e, char *t); +char *ewl_password_text_get(Ewl_Password * e); +void ewl_password_obscure_set(Ewl_Password * e, char o); +char ewl_password_obscure_get(Ewl_Password * e); -void ewl_password_insert_text(Ewl_Password * e, char *s); +void ewl_password_text_insert(Ewl_Password * e, char *s); /* * Internally used callbacks, override at your own risk. |
From: <enl...@li...> - 2004-08-23 00:32:54
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/test Modified Files: ewl_notebook_test.c Log Message: api breakage, the ewl_notebook =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_notebook_test.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- ewl_notebook_test.c 19 Aug 2004 20:03:34 -0000 1.26 +++ ewl_notebook_test.c 23 Aug 2004 00:32:36 -0000 1.27 @@ -34,16 +34,16 @@ return; if (w == button_aleft) - ewl_notebook_set_tabs_alignment(user_data, EWL_FLAG_ALIGN_LEFT); + ewl_notebook_tabs_alignment_set(user_data, EWL_FLAG_ALIGN_LEFT); else if (w == button_acenter) - ewl_notebook_set_tabs_alignment(user_data, + ewl_notebook_tabs_alignment_set(user_data, EWL_FLAG_ALIGN_CENTER); else if (w == button_aright) - ewl_notebook_set_tabs_alignment(user_data, EWL_FLAG_ALIGN_RIGHT); + ewl_notebook_tabs_alignment_set(user_data, EWL_FLAG_ALIGN_RIGHT); else if (w == button_atop) - ewl_notebook_set_tabs_alignment(user_data, EWL_FLAG_ALIGN_TOP); + ewl_notebook_tabs_alignment_set(user_data, EWL_FLAG_ALIGN_TOP); else if (w == button_abottom) - ewl_notebook_set_tabs_alignment(user_data, + ewl_notebook_tabs_alignment_set(user_data, EWL_FLAG_ALIGN_BOTTOM); return; @@ -59,13 +59,13 @@ return; if (w == button_pleft) - ewl_notebook_set_tabs_position(user_data, EWL_POSITION_LEFT); + ewl_notebook_tabs_position_set(user_data, EWL_POSITION_LEFT); else if (w == button_pright) - ewl_notebook_set_tabs_position(user_data, EWL_POSITION_RIGHT); + ewl_notebook_tabs_position_set(user_data, EWL_POSITION_RIGHT); else if (w == button_ptop) - ewl_notebook_set_tabs_position(user_data, EWL_POSITION_TOP); + ewl_notebook_tabs_position_set(user_data, EWL_POSITION_TOP); else if (w == button_pbottom) - ewl_notebook_set_tabs_position(user_data, EWL_POSITION_BOTTOM); + ewl_notebook_tabs_position_set(user_data, EWL_POSITION_BOTTOM); return; ev_data = NULL; @@ -181,7 +181,7 @@ __notebook_change_position, notebook); ewl_widget_show(button_pbottom); - ewl_notebook_prepend_page(EWL_NOTEBOOK(notebook), tab, main_vbox); + ewl_notebook_page_prepend(EWL_NOTEBOOK(notebook), tab, main_vbox); return; } @@ -236,7 +236,7 @@ __notebook_remove_visible_page, notebook); ewl_widget_show(button[2]); - ewl_notebook_append_page(EWL_NOTEBOOK(notebook), tab, main_vbox); + ewl_notebook_page_append(EWL_NOTEBOOK(notebook), tab, main_vbox); return; } @@ -266,7 +266,7 @@ void __notebook_remove_visible_page(Ewl_Widget * w, void *ev_data, void *user_data) { - ewl_notebook_remove_visible(EWL_NOTEBOOK(user_data)); + ewl_notebook_visible_page_remove(EWL_NOTEBOOK(user_data)); return; w = NULL; @@ -303,7 +303,7 @@ ewl_widget_show(notebook_box); notebook = ewl_notebook_new(); - ewl_notebook_set_tabs_position(EWL_NOTEBOOK(notebook), + ewl_notebook_tabs_position_set(EWL_NOTEBOOK(notebook), EWL_POSITION_LEFT); ewl_container_child_append(EWL_CONTAINER(notebook_box), notebook); ewl_widget_show(notebook); |
From: <enl...@li...> - 2004-08-23 00:32:54
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_notebook.c ewl_notebook.h Log Message: api breakage, the ewl_notebook =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- ewl_notebook.c 19 Aug 2004 20:03:33 -0000 1.50 +++ ewl_notebook.c 23 Aug 2004 00:32:36 -0000 1.51 @@ -84,7 +84,7 @@ } /** - * ewl_notebook_append_page - append a page to the notebook + * ewl_notebook_page_append - append a page to the notebook * @n: the notebook to append the page * @t: the tab of the new page added * @p: the contents of the page added @@ -92,7 +92,7 @@ * Returns no value. Appends a page to the list of available pages that will * be available for display. */ -void ewl_notebook_append_page(Ewl_Notebook * n, Ewl_Widget * t, Ewl_Widget * p) +void ewl_notebook_page_append(Ewl_Notebook * n, Ewl_Widget * t, Ewl_Widget * p) { Ewl_Widget *w; Ewl_Widget *b; @@ -121,7 +121,7 @@ } /** - * ewl_notebook_prepend_page - prepend a page to the notebook + * ewl_notebook_page_prepend - prepend a page to the notebook * @n: the notebook to prepend the page * @t: the tab of the new page added * @p: the contents of the page added @@ -129,7 +129,7 @@ * Returns no value. Prepends a page to the list of available pages that will * be available for display. */ -void ewl_notebook_prepend_page(Ewl_Notebook * n, Ewl_Widget * t, Ewl_Widget * p) +void ewl_notebook_page_prepend(Ewl_Notebook * n, Ewl_Widget * t, Ewl_Widget * p) { Ewl_Widget *w; Ewl_Widget *b; @@ -144,7 +144,7 @@ if (t) ewl_container_child_append(EWL_CONTAINER(b), t); ewl_callback_append(b, EWL_CALLBACK_CLICKED, ewl_notebook_tab_click_cb, - p); + p); ewl_widget_show(b); ewl_container_child_prepend(EWL_CONTAINER(n->tab_box), b); @@ -158,7 +158,7 @@ } /** - * ewl_notebook_insert_page - insert a page to the notebook + * ewl_notebook_page_insert - insert a page to the notebook * @n: the notebook to insert the page * @t: the tab of the new page added * @p: the contents of the page added @@ -168,7 +168,7 @@ * be available for display. */ void -ewl_notebook_insert_page(Ewl_Notebook * n, Ewl_Widget * t, Ewl_Widget * p, +ewl_notebook_page_insert(Ewl_Notebook * n, Ewl_Widget * t, Ewl_Widget * p, int pos) { Ewl_Widget *w; @@ -198,12 +198,12 @@ } /** - * ewl_notebook_remove_first_page - remove the first page from the notebook + * ewl_notebook_first_page_remove - remove the first page from the notebook * @n: the notebook to remove the first page * * Returns a pointer to the removed page on success, NULL on failure. */ -void ewl_notebook_remove_first_page(Ewl_Notebook * n) +void ewl_notebook_first_page_remove(Ewl_Notebook * n) { Ewl_Widget *w; Ewl_Widget *page = NULL; @@ -229,7 +229,7 @@ ewl_widget_destroy(tab); if (page == n->visible_page) { n->visible_page = NULL; - ewl_notebook_set_visible_page(n, 0); + ewl_notebook_visible_page_set(n, 0); } ewl_widget_destroy(page); } @@ -238,12 +238,12 @@ } /** - * ewl_notebook_remove_first_page - remove the last page from the notebook + * ewl_notebook_first_page_remove - remove the last page from the notebook * @n: the notebook to remove the last page * * Returns a pointer to the removed page on success, NULL on failure. */ -void ewl_notebook_remove_last_page(Ewl_Notebook * n) +void ewl_notebook_last_page_remove(Ewl_Notebook * n) { Ewl_Widget *w; Ewl_Widget *page = NULL; @@ -274,7 +274,7 @@ ewl_widget_destroy(tab); if (page == n->visible_page) { n->visible_page = NULL; - ewl_notebook_set_visible_page(n, 0); + ewl_notebook_visible_page_set(n, 0); } ewl_widget_destroy(page); } @@ -283,13 +283,13 @@ } /** - * ewl_notebook_remove_page - remove the specified page from the notebook + * ewl_notebook_page_remove - remove the specified page from the notebook * @n: the notebook to remove the specified page * @i: the position in the list of pages to remove from @n * * Returns a pointer to the removed page on success, NULL on failure. */ -void ewl_notebook_remove_page(Ewl_Notebook * n, int i) +void ewl_notebook_page_remove(Ewl_Notebook * n, int i) { int j = 1; Ewl_Widget *w; @@ -319,7 +319,7 @@ ewl_widget_destroy(tab); if (page == n->visible_page) { n->visible_page = NULL; - ewl_notebook_set_visible_page(n, 0); + ewl_notebook_visible_page_set(n, 0); } ewl_widget_destroy(page); } @@ -328,12 +328,12 @@ } /** - * ewl_notebook_remove_visible - remove the visible page from the notebook + * ewl_notebook_visible_page_remove - remove the visible page from the notebook * @n: the notebook to remove the visible page * * Returns no value. */ -void ewl_notebook_remove_visible(Ewl_Notebook * n) +void ewl_notebook_visible_page_remove(Ewl_Notebook * n) { Ewl_Widget *w; Ewl_Widget *page = NULL; @@ -377,21 +377,21 @@ * Set a usable visible page. */ n->visible_page = NULL; - ewl_notebook_set_visible_page(n, 0); + ewl_notebook_visible_page_set(n, 0); } DLEAVE_FUNCTION(DLEVEL_STABLE); } /** - * ewl_notebook_set_tabs_alignment - set the alignment of a notebooks tabs + * ewl_notebook_tabs_alignment_set - set the alignment of a notebooks tabs * @n: the notebook to change tab alignment * @a: the new alignment for the tabs of @n * * Returns no value. Changes the alignment of the tabs on @n to @a, and * updates the display. */ -void ewl_notebook_set_tabs_alignment(Ewl_Notebook * n, unsigned int a) +void ewl_notebook_tabs_alignment_set(Ewl_Notebook * n, unsigned int a) { Ewl_Widget *w; @@ -408,12 +408,12 @@ } /** - * ewl_notebook_get_tabs_alignment - get the alignment of a notebooks tabs + * ewl_notebook_tabs_alignment_get - get the alignment of a notebooks tabs * @n: the notebook to get tab alignment * * Returns the tab alignment of the notebook @n on success, 0 on failure. */ -unsigned int ewl_notebook_get_tabs_alignment(Ewl_Notebook * n) +unsigned int ewl_notebook_tabs_alignment_get(Ewl_Notebook * n) { Ewl_Widget *w; @@ -427,14 +427,14 @@ } /** - * ewl_notebook_set_tabs_position - set a notebooks tab position + * ewl_notebook_tabs_position_set - set a notebooks tab position * @n: the notebook to change tab position * @p: the new position for the tabs of @n * * Returns no value. Changes the tab position of @n to @p and updates the * display. */ -void ewl_notebook_set_tabs_position(Ewl_Notebook * n, Ewl_Position p) +void ewl_notebook_tabs_position_set(Ewl_Notebook * n, Ewl_Position p) { Ewl_Widget *w; char file[PATH_MAX]; @@ -512,12 +512,12 @@ } /** - * ewl_notebook_get_tabs_position - get the position of a notebooks tabs + * ewl_notebook_tabs_position_get - get the position of a notebooks tabs * @n: the notebook to retrieve the tab position * * Returns the position of the tabs in @n on success, 0 on failure. */ -Ewl_Position ewl_notebook_get_tabs_position(Ewl_Notebook * n) +Ewl_Position ewl_notebook_tabs_position_get(Ewl_Notebook * n) { Ewl_Widget *w; @@ -530,13 +530,13 @@ } /** - * ewl_notebook_set_flags - set the flags for a notebook + * ewl_notebook_tabs_visible_set - set the visibility of the tabs * @n: the notebook to change flags - * @flags: the new flags for the notebook @n + * @show: the sets if the tabs should be shown (0) or not (1) * - * Returns no value. Sets the flags for the notebook @n to @flags. + * Returns no value. Sets the visiblity for the tabs */ -void ewl_notebook_set_tabs_visible(Ewl_Notebook * n, int show) +void ewl_notebook_tabs_visible_set(Ewl_Notebook * n, int show) { Ewl_Widget *w; @@ -566,7 +566,7 @@ * The notebook @a n switches to the tab number @a t where @a t is between 0 * and the number of widgets in the notebook. */ -void ewl_notebook_set_visible_page(Ewl_Notebook *n, int t) +void ewl_notebook_visible_page_set(Ewl_Notebook *n, int t) { int i = 0; Ewl_Container *c; @@ -607,7 +607,7 @@ * @return Returns the current page number on success. * @brief Retrieves the position of the current page in the notebook @a n. */ -int ewl_notebook_get_visible_page(Ewl_Notebook *n) +int ewl_notebook_visible_page_get(Ewl_Notebook *n) { int i = 0; Ewl_Container *c; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ewl_notebook.h 18 Mar 2004 03:41:23 -0000 1.20 +++ ewl_notebook.h 23 Aug 2004 00:32:36 -0000 1.21 @@ -22,30 +22,30 @@ Ewl_Widget *ewl_notebook_new(void); int ewl_notebook_init(Ewl_Notebook * n); -void ewl_notebook_append_page(Ewl_Notebook * n, Ewl_Widget * c, - Ewl_Widget * l); -void ewl_notebook_prepend_page(Ewl_Notebook * n, Ewl_Widget * c, - Ewl_Widget * l); -void ewl_notebook_insert_page(Ewl_Notebook * n, Ewl_Widget * c, - Ewl_Widget * l, int p); - -void ewl_notebook_remove_first_page(Ewl_Notebook * n); -void ewl_notebook_remove_last_page(Ewl_Notebook * n); -void ewl_notebook_remove_page(Ewl_Notebook * n, int i); -void ewl_notebook_remove_visible(Ewl_Notebook * n); - -void ewl_notebook_set_tabs_alignment(Ewl_Notebook * n, - unsigned int a); -unsigned int ewl_notebook_get_tabs_alignment(Ewl_Notebook * n); - -void ewl_notebook_set_tabs_position(Ewl_Notebook * n, - Ewl_Position p); -Ewl_Position ewl_notebook_get_tabs_position(Ewl_Notebook * n); +void ewl_notebook_page_append(Ewl_Notebook * n, Ewl_Widget * c, + Ewl_Widget * l); +void ewl_notebook_page_prepend(Ewl_Notebook * n, Ewl_Widget * c, + Ewl_Widget * l); +void ewl_notebook_page_insert(Ewl_Notebook * n, Ewl_Widget * c, + Ewl_Widget * l, int p); + +void ewl_notebook_first_page_remove(Ewl_Notebook * n); +void ewl_notebook_last_page_remove(Ewl_Notebook * n); +void ewl_notebook_page_remove(Ewl_Notebook * n, int i); +void ewl_notebook_visible_page_remove(Ewl_Notebook * n); + +void ewl_notebook_tabs_alignment_set(Ewl_Notebook * n, + unsigned int a); +unsigned int ewl_notebook_tabs_alignment_get(Ewl_Notebook * n); + +void ewl_notebook_tabs_position_set(Ewl_Notebook * n, + Ewl_Position p); +Ewl_Position ewl_notebook_tabs_position_get(Ewl_Notebook * n); -void ewl_notebook_set_tabs_visible(Ewl_Notebook * n, int show); +void ewl_notebook_tabs_visible_set(Ewl_Notebook * n, int show); -void ewl_notebook_set_visible_page(Ewl_Notebook *n, int t); -int ewl_notebook_get_visible_page(Ewl_Notebook *n); +void ewl_notebook_visible_page_set(Ewl_Notebook *n, int t); +int ewl_notebook_visible_page_get(Ewl_Notebook *n); /* * Internally used callbacks, override at your own risk. |
From: <enl...@li...> - 2004-08-23 00:42:24
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_events.c ewl_misc.c ewl_misc.h ewl_window.c Log Message: change ewl_misc api, shouldn't affect any apps as they are internal routines =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_events.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- ewl_events.c 18 Aug 2004 02:28:54 -0000 1.65 +++ ewl_events.c 23 Aug 2004 00:42:12 -0000 1.66 @@ -54,7 +54,7 @@ unsigned int engine; DENTER_FUNCTION(DLEVEL_STABLE); - engine = ewl_get_engine_mask(); + engine = ewl_engine_mask_get(); #ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H /* * Register dispatching functions for window events. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_misc.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- ewl_misc.c 12 Aug 2004 16:20:44 -0000 1.78 +++ ewl_misc.c 23 Aug 2004 00:42:12 -0000 1.79 @@ -625,7 +625,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); - ewl_enter_realize_phase(); + ewl_realize_phase_enter(); /* * First realize any widgets that require it, this looping should @@ -655,7 +655,7 @@ EWL_FLAG_QUEUED_RSCHEDULED); } - ewl_exit_realize_phase(); + ewl_realize_phase_exit(); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -664,7 +664,7 @@ * @return Returns no value. * @brief Marks that EWL is currently realizing a widget. */ -void ewl_enter_realize_phase() +void ewl_realize_phase_enter() { DENTER_FUNCTION(DLEVEL_STABLE); @@ -677,7 +677,7 @@ * @return Returns no value. * @brief Marks that EWL is not realizing a widget. */ -void ewl_exit_realize_phase() +void ewl_realize_phase_exit() { DENTER_FUNCTION(DLEVEL_STABLE); @@ -696,7 +696,7 @@ DRETURN_INT((phase_status & EWL_FLAG_QUEUED_RSCHEDULED), DLEVEL_STABLE); } -unsigned int ewl_get_engine_mask() +unsigned int ewl_engine_mask_get() { DENTER_FUNCTION(DLEVEL_STABLE); DRETURN_INT(use_engine, DLEVEL_STABLE); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_misc.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- ewl_misc.h 9 Jul 2004 13:24:50 -0000 1.27 +++ ewl_misc.h 23 Aug 2004 00:42:12 -0000 1.28 @@ -26,10 +26,10 @@ void ewl_realize_queue(void); void ewl_destroy_request(Ewl_Widget *w); void ewl_garbage_collect(void); -void ewl_enter_realize_phase(void); -void ewl_exit_realize_phase(void); +void ewl_realize_phase_enter(void); +void ewl_realize_phase_exit(void); int ewl_in_realize_phase(void); -unsigned int ewl_get_engine_mask(); +unsigned int ewl_engine_mask_get(); void ewl_evas_destroy(Evas *evas); void ewl_evas_object_destroy(Evas_Object *obj); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- ewl_window.c 22 Aug 2004 19:28:03 -0000 1.89 +++ ewl_window.c 23 Aug 2004 00:42:12 -0000 1.90 @@ -427,7 +427,7 @@ */ #ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H if (strstr(render, "x11") && - (ewl_get_engine_mask() & (EWL_ENGINE_SOFTWARE_X11 | + (ewl_engine_mask_get() & (EWL_ENGINE_SOFTWARE_X11 | EWL_ENGINE_GL_X11))) { window->window = (void *)ecore_x_window_new(0, window->x, window->y, @@ -451,7 +451,7 @@ */ #ifdef HAVE_EVAS_ENGINE_GL_X11_H if (!strcmp(render, "gl_x11") && - (ewl_get_engine_mask() & EWL_ENGINE_GL_X11)) { + (ewl_engine_mask_get() & EWL_ENGINE_GL_X11)) { Evas_Engine_Info_GL_X11 *glinfo; glinfo = (Evas_Engine_Info_GL_X11 *)info; @@ -472,7 +472,7 @@ #endif #ifdef HAVE_EVAS_ENGINE_FB_H if (!strcmp(render, "fb") && - (ewl_get_engine_mask() & EWL_ENGINE_FB)) { + (ewl_engine_mask_get() & EWL_ENGINE_FB)) { Evas_Engine_Info_FB *fbinfo; window->window = fbinfo = (Evas_Engine_Info_FB *)info; @@ -488,7 +488,7 @@ #endif #ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H if (!strcmp(render, "software_x11") && - (ewl_get_engine_mask() & EWL_ENGINE_SOFTWARE_X11)) { + (ewl_engine_mask_get() & EWL_ENGINE_SOFTWARE_X11)) { Evas_Engine_Info_Software_X11 *sinfo; sinfo = (Evas_Engine_Info_Software_X11 *)info; |
From: <enl...@li...> - 2004-08-23 00:50:37
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_menu_base.c ewl_menu_base.h Log Message: api breakage, ewl_menu_base =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- ewl_menu_base.c 22 Aug 2004 04:50:28 -0000 1.37 +++ ewl_menu_base.c 23 Aug 2004 00:50:19 -0000 1.38 @@ -1,7 +1,7 @@ #include <Ewl.h> -static int ewl_menu_item_create_image( Ewl_Menu_Item *item, - char *image, char *text ); +static int ewl_menu_item_image_create( Ewl_Menu_Item *item, + char *image, char *text ); /** * @param menu: the menu item to initialize @@ -123,7 +123,7 @@ EWL_CALLBACK_DESELECT); item->icon = NULL; - if (!ewl_menu_item_create_image(item, image, text)) + if (!ewl_menu_item_image_create(item, image, text)) DRETURN_INT(FALSE, DLEVEL_STABLE); /* @@ -144,8 +144,8 @@ DRETURN_INT(TRUE, DLEVEL_STABLE); } -static int ewl_menu_item_create_image( Ewl_Menu_Item *item, - char *image, char *text ) { +static int ewl_menu_item_image_create( Ewl_Menu_Item *item, + char *image, char *text ) { Ewl_Container *redirect; if (item->icon) @@ -188,7 +188,7 @@ * @brief Get the text of a menu item */ char * -ewl_menu_item_get_text( Ewl_Menu_Item *item ) +ewl_menu_item_text_get( Ewl_Menu_Item *item ) { if (item->text) DRETURN_PTR(ewl_text_text_get(EWL_TEXT(item->text)), DLEVEL_STABLE); @@ -201,7 +201,7 @@ * @brief Sets the text of a menu item */ void -ewl_menu_item_set_text( Ewl_Menu_Item *item, char *text ) +ewl_menu_item_text_set( Ewl_Menu_Item *item, char *text ) { if (item->text) ewl_text_text_set(EWL_TEXT(item->text), text); @@ -213,7 +213,7 @@ * @brief Get the image of a menu item */ char * -ewl_menu_item_get_image( Ewl_Menu_Item *item ) +ewl_menu_item_image_get( Ewl_Menu_Item *item ) { if (item->icon && ewl_widget_type_is(item->icon, "image")) DRETURN_PTR(ewl_image_get_file(EWL_IMAGE(item->icon)), DLEVEL_STABLE); @@ -226,13 +226,13 @@ * @brief Set the image of a menu item */ void -ewl_menu_item_set_image( Ewl_Menu_Item *item, char *image ) +ewl_menu_item_image_set( Ewl_Menu_Item *item, char *image ) { if (item->icon && ewl_widget_type_is(item->icon, "image")) ewl_image_set_file(EWL_IMAGE(item->icon), image, NULL); else { - ewl_menu_item_create_image( item, image, - ewl_text_text_get(EWL_TEXT(item->text)) ); + ewl_menu_item_image_create( item, image, + ewl_text_text_get(EWL_TEXT(item->text)) ); } } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_menu_base.h 12 Aug 2004 16:20:44 -0000 1.17 +++ ewl_menu_base.h 23 Aug 2004 00:50:19 -0000 1.18 @@ -78,18 +78,18 @@ Ewl_Widget *ewl_menu_item_new(char *image, char *title); int ewl_menu_item_init(Ewl_Menu_Item * menu, char *image, - char *title); -char *ewl_menu_item_get_text(Ewl_Menu_Item * item); -void ewl_menu_item_set_text(Ewl_Menu_Item * item, char *text); -char *ewl_menu_item_get_image(Ewl_Menu_Item * item); -void ewl_menu_item_set_image(Ewl_Menu_Item * item, char *image); + char *title); +char *ewl_menu_item_text_get(Ewl_Menu_Item * item); +void ewl_menu_item_text_set(Ewl_Menu_Item * item, char *text); +char *ewl_menu_item_image_get(Ewl_Menu_Item * item); +void ewl_menu_item_image_set(Ewl_Menu_Item * item, char *image); Ewl_Widget *ewl_menu_separator_new(void); void ewl_menu_separator_init(Ewl_Menu_Separator *sep); void ewl_menu_base_init(Ewl_Menu_Base * menu, char *image, - char *title); + char *title); /* * Internally used callbacks, override at your own risk. |
From: <enl...@li...> - 2004-08-23 00:58:15
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_image.c ewl_image.h ewl_menu_base.c Log Message: api breakage, ewl_image =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- ewl_image.c 13 Aug 2004 00:41:13 -0000 1.49 +++ ewl_image.c 23 Aug 2004 00:58:04 -0000 1.50 @@ -1,7 +1,7 @@ #include <Ewl.h> -static Ewl_Image_Type ewl_image_get_type(const char *i); +static Ewl_Image_Type ewl_image_type_get(const char *i); /** * @param i: the path to the image to be displayed by the image widget @@ -66,7 +66,7 @@ i->sw = 1.0; i->sh = 1.0; - ewl_image_set_file(i, path, key); + ewl_image_file_set(i, path, key); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -76,7 +76,7 @@ * @return Returns the currently set filename * @brief get the filename this image uses */ -char *ewl_image_get_file(Ewl_Image * i) +char *ewl_image_file_get(Ewl_Image * i) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("i", i, NULL); @@ -93,7 +93,7 @@ * * Set the image displayed by @a i to the one found at the path @a im. */ -void ewl_image_set_file(Ewl_Image * i, char *im, char *key) +void ewl_image_file_set(Ewl_Image * i, char *im, char *key) { int old_type; Ewl_Widget *w; @@ -114,7 +114,7 @@ */ old_type = i->type; if (im) { - i->type = ewl_image_get_type(im); + i->type = ewl_image_type_get(im); i->path = strdup(im); if (key) i->key = strdup(key); @@ -158,7 +158,7 @@ * Changes the flag indicating if the image is scaled proportionally. */ void -ewl_image_set_proportional(Ewl_Image *i, char p) +ewl_image_proportional_set(Ewl_Image *i, char p) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -378,7 +378,7 @@ /* * Determine the type of the file based on the filename. */ -static Ewl_Image_Type ewl_image_get_type(const char *i) +static Ewl_Image_Type ewl_image_type_get(const char *i) { int l; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ewl_image.h 27 Jul 2004 13:55:42 -0000 1.22 +++ ewl_image.h 23 Aug 2004 00:58:04 -0000 1.23 @@ -43,9 +43,9 @@ Ewl_Widget *ewl_image_new(char *i, char *k); void ewl_image_init(Ewl_Image * i, char *path, char *key); -void ewl_image_set_file(Ewl_Image * i, char *im, char *key); -char *ewl_image_get_file(Ewl_Image * i); -void ewl_image_set_proportional(Ewl_Image * i, char p); +void ewl_image_file_set(Ewl_Image * i, char *im, char *key); +char *ewl_image_file_get(Ewl_Image * i); +void ewl_image_proportional_set(Ewl_Image * i, char p); void ewl_image_scale(Ewl_Image *i, double wp, double hp); void ewl_image_scale_to(Ewl_Image *i, int w, int h); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- ewl_menu_base.c 23 Aug 2004 00:50:19 -0000 1.38 +++ ewl_menu_base.c 23 Aug 2004 00:58:04 -0000 1.39 @@ -216,7 +216,7 @@ ewl_menu_item_image_get( Ewl_Menu_Item *item ) { if (item->icon && ewl_widget_type_is(item->icon, "image")) - DRETURN_PTR(ewl_image_get_file(EWL_IMAGE(item->icon)), DLEVEL_STABLE); + DRETURN_PTR(ewl_image_file_get(EWL_IMAGE(item->icon)), DLEVEL_STABLE); DRETURN_PTR(NULL, DLEVEL_STABLE); } @@ -229,7 +229,7 @@ ewl_menu_item_image_set( Ewl_Menu_Item *item, char *image ) { if (item->icon && ewl_widget_type_is(item->icon, "image")) - ewl_image_set_file(EWL_IMAGE(item->icon), image, NULL); + ewl_image_file_set(EWL_IMAGE(item->icon), image, NULL); else { ewl_menu_item_image_create( item, image, ewl_text_text_get(EWL_TEXT(item->text)) ); |
From: <enl...@li...> - 2004-08-23 00:58:16
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/test Modified Files: ewl_image_test.c Log Message: api breakage, ewl_image =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_image_test.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- ewl_image_test.c 19 Aug 2004 20:03:34 -0000 1.26 +++ ewl_image_test.c 23 Aug 2004 00:58:04 -0000 1.27 @@ -57,7 +57,7 @@ img = ecore_dlist_goto_last(images); ewl_entry_set_text(EWL_ENTRY(entry_path), img); - ewl_image_set_file(EWL_IMAGE(image), img, NULL); + ewl_image_file_set(EWL_IMAGE(image), img, NULL); ewl_widget_configure(image_win); @@ -77,7 +77,7 @@ if (img && __image_exists(img)) { ecore_dlist_append(images, img); ecore_dlist_goto_last(images); - ewl_image_set_file(EWL_IMAGE(image), img, NULL); + ewl_image_file_set(EWL_IMAGE(image), img, NULL); } else printf("ERROR: %s does not exist\n", img); @@ -102,7 +102,7 @@ img = ecore_dlist_goto_first(images); ewl_entry_set_text(EWL_ENTRY(entry_path), img); - ewl_image_set_file(EWL_IMAGE(image), img, NULL); + ewl_image_file_set(EWL_IMAGE(image), img, NULL); ewl_widget_configure(image_win); |
From: <enl...@li...> - 2004-08-23 01:07:28
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_grid.c ewl_grid.h ewl_table.c Log Message: api breakage, ewl_grid =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_grid.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ewl_grid.c 18 Aug 2004 03:15:20 -0000 1.22 +++ ewl_grid.c 23 Aug 2004 01:07:16 -0000 1.23 @@ -203,14 +203,14 @@ /** - * ewl_grid_set_col_w - set the width of a column + * ewl_grid_col_w_set - set the width of a column * @g: the grid * @col: the column * @width: the new width * * Returns no value. */ -void ewl_grid_set_col_w(Ewl_Grid * g, int col, int width) +void ewl_grid_col_w_set(Ewl_Grid * g, int col, int width) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -241,7 +241,7 @@ /** - * ewl_grid_get_col_w - get the width of a column + * ewl_grid_col_w_get - get the width of a column * * @g: the grid * @col: the column @@ -249,7 +249,7 @@ * * Returns no value. */ -void ewl_grid_get_col_w(Ewl_Grid * g, int col, int *width) +void ewl_grid_col_w_get(Ewl_Grid * g, int col, int *width) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("g", g); @@ -261,14 +261,14 @@ /** - * ewl_grid_set_row_h - set the height of a row + * ewl_grid_row_h_set - set the height of a row * @g: the grid * @col: the row * @width: the new height * * Returns no value. */ -void ewl_grid_set_row_h(Ewl_Grid * g, int row, int height) +void ewl_grid_row_h_set(Ewl_Grid * g, int row, int height) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -296,7 +296,7 @@ } /** - * ewl_grid_get_row_h - get the height of a row + * ewl_grid_row_h_get - get the height of a row * * @g: the grid * @row: the row @@ -304,7 +304,7 @@ * * Returns no value. */ -void ewl_grid_get_row_h(Ewl_Grid * g, int row, int *height) +void ewl_grid_row_h_get(Ewl_Grid * g, int row, int *height) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("g", g); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_grid.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_grid.h 24 Mar 2004 04:11:09 -0000 1.8 +++ ewl_grid.h 23 Aug 2004 01:07:16 -0000 1.9 @@ -61,11 +61,11 @@ int start_col, int end_col, int start_row, int end_row); -void ewl_grid_set_col_w(Ewl_Grid * g, int col, int width); -void ewl_grid_set_row_h(Ewl_Grid * g, int row, int height); +void ewl_grid_col_w_set(Ewl_Grid * g, int col, int width); +void ewl_grid_row_h_set(Ewl_Grid * g, int row, int height); -void ewl_grid_get_col_w(Ewl_Grid * g, int col, int *width); -void ewl_grid_get_row_h(Ewl_Grid * g, int row, int *height); +void ewl_grid_col_w_get(Ewl_Grid * g, int col, int *width); +void ewl_grid_row_h_get(Ewl_Grid * g, int row, int *height); void ewl_grid_reset(Ewl_Grid * g, int rows, int cols); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- ewl_table.c 18 Aug 2004 03:33:02 -0000 1.48 +++ ewl_table.c 23 Aug 2004 01:07:16 -0000 1.49 @@ -253,7 +253,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("table", table); - ewl_grid_set_col_w(table->grid, col, width); + ewl_grid_col_w_set(table->grid, col, width); ewl_widget_configure(EWL_WIDGET(table)); DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -277,7 +277,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("table", table); - ewl_grid_get_col_w(table->grid, col, width); + ewl_grid_col_w_get(table->grid, col, width); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -301,7 +301,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("table", table); - ewl_grid_set_row_h(table->grid, row, height); + ewl_grid_row_h_set(table->grid, row, height); ewl_widget_configure(EWL_WIDGET(table)); DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -325,7 +325,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("table", table); - ewl_grid_get_row_h(table->grid, row, height); + ewl_grid_row_h_get(table->grid, row, height); DLEAVE_FUNCTION(DLEVEL_STABLE); } |
From: <enl...@li...> - 2004-08-23 01:17:58
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_combo.c ewl_floater.c ewl_floater.h ewl_imenu.c Log Message: - api breakage, ewl_floater - cleanup warnings in test files =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_combo.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ewl_combo.c 19 Aug 2004 20:03:32 -0000 1.7 +++ ewl_combo.c 23 Aug 2004 01:17:30 -0000 1.8 @@ -181,11 +181,11 @@ * Position the popup combo relative to the combo. */ if (EWL_MENU_ITEM(w)->inmenu) { - ewl_floater_set_position(EWL_FLOATER(combo->base.popup), + ewl_floater_position_set(EWL_FLOATER(combo->base.popup), CURRENT_W(w), 0); } else { - ewl_floater_set_position(EWL_FLOATER(combo->base.popup), 0, + ewl_floater_position_set(EWL_FLOATER(combo->base.popup), 0, CURRENT_H(w)); } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_floater.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ewl_floater.c 13 Aug 2004 00:41:13 -0000 1.19 +++ ewl_floater.c 23 Aug 2004 01:17:30 -0000 1.20 @@ -75,7 +75,7 @@ * @return Returns no value * @brief Set the start x/y position of the floater */ -void ewl_floater_set_position(Ewl_Floater * f, int x, int y) +void ewl_floater_position_set(Ewl_Floater * f, int x, int y) { DENTER_FUNCTION(DLEVEL_UNSTABLE); @@ -108,7 +108,7 @@ * Sets the floater @a f to be positioned relative to the * position of the widget @a w. */ -void ewl_floater_set_relative(Ewl_Floater * f, Ewl_Widget * w) +void ewl_floater_relative_set(Ewl_Floater * f, Ewl_Widget * w) { DENTER_FUNCTION(DLEVEL_UNSTABLE); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_floater.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ewl_floater.h 14 Jan 2004 20:42:54 -0000 1.9 +++ ewl_floater.h 23 Aug 2004 01:17:30 -0000 1.10 @@ -42,7 +42,7 @@ Ewl_Widget *ewl_floater_new(Ewl_Widget * parent); -void ewl_floater_set_position(Ewl_Floater * parent, int x, int y); +void ewl_floater_position_set(Ewl_Floater * parent, int x, int y); void ewl_floater_init(Ewl_Floater * f, Ewl_Widget * parent); /* =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- ewl_imenu.c 22 Aug 2004 05:38:31 -0000 1.23 +++ ewl_imenu.c 23 Aug 2004 01:17:30 -0000 1.24 @@ -73,11 +73,11 @@ * Position the popup menu relative to the menu. */ if (EWL_MENU_ITEM(w)->inmenu) { - ewl_floater_set_position(EWL_FLOATER(menu->base.popup), + ewl_floater_position_set(EWL_FLOATER(menu->base.popup), ewl_object_current_w_get(EWL_OBJECT(w)), 0); } else { - ewl_floater_set_position(EWL_FLOATER(menu->base.popup), 0, + ewl_floater_position_set(EWL_FLOATER(menu->base.popup), 0, ewl_object_current_h_get(EWL_OBJECT(w))); } |