Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src


Modified Files:
        ewl_entry.c ewl_scrollbar.c ewl_spinner.c ewl_text.c 
        ewl_theme.c ewl_theme.h ewl_widget.c 


Log Message:
- update ewl_theme api

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- ewl_entry.c 17 Aug 2004 17:41:34 -0000      1.96
+++ ewl_entry.c 18 Aug 2004 03:04:32 -0000      1.97
@@ -859,7 +859,7 @@
         * Check the theme for a velocity setting and bring it within normal
         * useable bounds.
         */
-       velocity = ewl_theme_data_get_int(EWL_WIDGET(e), "velocity");
+       velocity = ewl_theme_data_int_get(EWL_WIDGET(e), "velocity");
        if (velocity < 1)
                velocity = 1;
        else if (velocity > 10)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_scrollbar.c     13 Aug 2004 00:41:13 -0000      1.31
+++ ewl_scrollbar.c     18 Aug 2004 03:04:32 -0000      1.32
@@ -148,7 +148,7 @@
        /*
         * Set the alignment of the buttons to the seeker.
         */
-       s->buttons_alignment = ewl_theme_data_get_int(EWL_WIDGET(s),
+       s->buttons_alignment = ewl_theme_data_int_get(EWL_WIDGET(s),
                                                      "button_order");
 
        /*
@@ -425,7 +425,7 @@
         * Check the theme for a velocity setting and bring it within normal
         * useable bounds.
         */
-       velocity = ewl_theme_data_get_int(EWL_WIDGET(s), "velocity");
+       velocity = ewl_theme_data_int_get(EWL_WIDGET(s), "velocity");
        if (velocity < 1)
                velocity = 1;
        else if (velocity > 10)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_spinner.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ewl_spinner.c       13 Aug 2004 00:41:13 -0000      1.55
+++ ewl_spinner.c       18 Aug 2004 03:04:32 -0000      1.56
@@ -573,7 +573,7 @@
         * Check the theme for a velocity setting and bring it within normal
         * useable bounds.
         */
-       velocity = ewl_theme_data_get_int(EWL_WIDGET(s), "velocity");
+       velocity = ewl_theme_data_int_get(EWL_WIDGET(s), "velocity");
        if (velocity < 1)
                velocity = 1;
        else if (velocity > 10)
@@ -583,7 +583,7 @@
         * Check the theme for a delay setting and bring it within normal
         * useable bounds.
         */
-       delay = ewl_theme_data_get_int(EWL_WIDGET(s), "delay");
+       delay = ewl_theme_data_int_get(EWL_WIDGET(s), "delay");
        if (delay < 1)
                delay = 1;
        else if (delay > 10)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_text.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- ewl_text.c  13 Aug 2004 00:41:13 -0000      1.76
+++ ewl_text.c  18 Aug 2004 03:04:32 -0000      1.77
@@ -543,19 +543,19 @@
        ta->etox = etox_new(emb->evas);
        ta->context = etox_get_context(ta->etox);
 
-       tmp = ewl_theme_data_get_str(w, "font");
+       tmp = ewl_theme_data_str_get(w, "font");
        etox_context_set_font(ta->context, tmp,
-                             ewl_theme_data_get_int(w, "font_size"));
+                             ewl_theme_data_int_get(w, "font_size"));
        IF_FREE(tmp);
 
-       tmp = ewl_theme_data_get_str(w, "style");
+       tmp = ewl_theme_data_str_get(w, "style");
        etox_context_set_style(ta->context, tmp);
        IF_FREE(tmp);
 
-       r = ewl_theme_data_get_int(w, "color/r");
-       g = ewl_theme_data_get_int(w, "color/g");
-       b = ewl_theme_data_get_int(w, "color/b");
-       a = ewl_theme_data_get_int(w, "color/a");
+       r = ewl_theme_data_int_get(w, "color/r");
+       g = ewl_theme_data_int_get(w, "color/g");
+       b = ewl_theme_data_int_get(w, "color/b");
+       a = ewl_theme_data_int_get(w, "color/a");
        etox_context_set_color(ta->context, r, g, b, a);
 
        if (w->fx_clip_box)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ewl_theme.c 26 Jul 2004 15:10:01 -0000      1.65
+++ ewl_theme.c 18 Aug 2004 03:04:32 -0000      1.66
@@ -13,7 +13,7 @@
 static Ecore_Hash *cached_theme_data = NULL;
 static Ecore_Hash *def_theme_data = NULL;
 
-static void ewl_theme_init_font_path(void);
+static void ewl_theme_font_path_init(void);
 
 /**
  * @return Returns TRUE on success, FALSE on failure.
@@ -158,7 +158,7 @@
                DRETURN_INT(FALSE, DLEVEL_STABLE);
        }
 
-       ewl_theme_init_font_path();
+       ewl_theme_font_path_init();
 
        IF_FREE(theme_name);
 
@@ -192,7 +192,7 @@
  * Initializes the font path based on the theme. Also called by ewl_init, and
  * is not recommended to be called separately.
  */
-static void ewl_theme_init_font_path()
+static void ewl_theme_font_path_init()
 {
        char           *font_path;
        char            key[PATH_MAX];
@@ -202,7 +202,7 @@
         */
        font_paths = ecore_list_new();
        if (font_paths) {
-               font_path = ewl_theme_data_get_str(NULL, "/theme/font_path");
+               font_path = ewl_theme_data_str_get(NULL, "/theme/font_path");
 
                if (font_path) {
                        if (*font_path == '/')
@@ -226,7 +226,7 @@
  *
  * Sets the widget @a w's theme information to the default values.
  */
-int ewl_theme_init_widget(Ewl_Widget * w)
+int ewl_theme_widget_init(Ewl_Widget * w)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR_RET("w", w, FALSE);
@@ -243,7 +243,7 @@
  *
  * Removes and frees the theme information from the widget @a w.
  */
-void ewl_theme_shutdown_widget(Ewl_Widget * w)
+void ewl_theme_widget_shutdown(Ewl_Widget * w)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
@@ -280,7 +280,7 @@
  * @brief Return the name of the current theme
  * @return Returns a copy of the current theme name on success, NULL on failure
  */
-char           *ewl_theme_name_get()
+char *ewl_theme_name_get()
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DRETURN_PTR((theme_name ? strdup(theme_name) : NULL), DLEVEL_STABLE);
@@ -290,7 +290,7 @@
  * @brief Return the path of the current theme
  * @return Returns a copy of the current theme path on success, NULL on failure
  */
-char           *ewl_theme_path_get()
+char *ewl_theme_path_get()
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DRETURN_PTR((theme_path ? strdup(theme_path) : NULL), DLEVEL_STABLE);
@@ -300,7 +300,7 @@
  * @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_get_db()
+E_DB_File *ewl_theme_db_get()
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DRETURN_PTR(theme_db, DLEVEL_STABLE);
@@ -310,7 +310,7 @@
  * @return Returns the font path of widget @a w on success, NULL on failure.
  * @brief retrieve the path of a widgets theme's fonts
  */
-Ecore_List       *ewl_theme_font_path_get()
+Ecore_List *ewl_theme_font_path_get()
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
 
@@ -346,7 +346,7 @@
  * @return Returns the path of image key @a k on success, NULL on failure.
  * @brief retrieve the path to an image from a widgets theme
  */
-char           *ewl_theme_image_get(Ewl_Widget * w, char *k)
+char *ewl_theme_image_get(Ewl_Widget * w, char *k)
 {
        char           *data;
        struct stat     st;
@@ -355,7 +355,7 @@
        DCHECK_PARAM_PTR_RET("w", w, NULL);
        DCHECK_PARAM_PTR_RET("k", k, NULL);
 
-       data = ewl_theme_data_get_str(w, k);
+       data = ewl_theme_data_str_get(w, k);
        if (!data && !theme_db)
                data = strdup(theme_path);
 
@@ -387,7 +387,7 @@
  * @return Returns the string associated with @a k on success, NULL on failure.
  * @brief Retrieve an string value from a widgets theme
  */
-char           *ewl_theme_data_get_str(Ewl_Widget * w, char *k)
+char *ewl_theme_data_str_get(Ewl_Widget * w, char *k)
 {
        char           *ret = NULL;
        char           *temp = NULL;
@@ -441,7 +441,7 @@
  * @return Returns the integer associated with key @a k on success, 0 on failure.
  * @brief Retrieve an integer value from a widgets theme
  */
-int ewl_theme_data_get_int(Ewl_Widget * w, char *k)
+int ewl_theme_data_int_get(Ewl_Widget * w, char *k)
 {
        int             ret = 0;
        char           *temp;
@@ -494,7 +494,7 @@
  * Changes the theme data in widget @a w so that key @a k now is
  * associated with value @a v.
  */
-void ewl_theme_data_set_str(Ewl_Widget * w, char *k, char *v)
+void ewl_theme_data_str_set(Ewl_Widget * w, char *k, char *v)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
@@ -526,7 +526,7 @@
  * Changes the theme data in widget @a w so that key @a k now is
  * associated with value @a v.
  */
-void ewl_theme_data_set_int(Ewl_Widget * w, char *k, int v)
+void ewl_theme_data_int_set(Ewl_Widget * w, char *k, int v)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
@@ -554,7 +554,7 @@
  * Sets the data associated with key @a k to value @a v in the default theme
  * data.
  */
-void ewl_theme_data_set_default_str(char *k, char *v)
+void ewl_theme_data_default_str_set(char *k, char *v)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
 
@@ -572,7 +572,7 @@
  * Sets the data associated with key @a k to value @a v in the
  * default theme data.
  */
-void ewl_theme_data_set_default_int(char *k, int v)
+void ewl_theme_data_default_int_set(char *k, int v)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_theme.h 28 Jun 2004 16:08:06 -0000      1.24
+++ ewl_theme.h 18 Aug 2004 03:04:33 -0000      1.25
@@ -31,21 +31,21 @@
 
 int             ewl_theme_init(void);
 void            ewl_theme_shutdown(void);
-int             ewl_theme_init_widget(Ewl_Widget * w);
-void            ewl_theme_shutdown_widget(Ewl_Widget * w);
+int             ewl_theme_widget_init(Ewl_Widget * w);
+void            ewl_theme_widget_shutdown(Ewl_Widget * w);
 void            ewl_theme_name_set(char *name);
 char           *ewl_theme_name_get(void);
 char           *ewl_theme_path_get(void);
-E_DB_File      *ewl_theme_get_db();
+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);
-char           *ewl_theme_data_get_str(Ewl_Widget * w, char *k);
-int             ewl_theme_data_get_int(Ewl_Widget * w, char *k);
-void            ewl_theme_data_set_str(Ewl_Widget * w, char *k, char *v);
-void            ewl_theme_data_set_int(Ewl_Widget * w, char *k, int v);
-void            ewl_theme_data_set_default_str(char *k, char *v);
-void            ewl_theme_data_set_default_int(char *k, int v);
+char           *ewl_theme_data_str_get(Ewl_Widget * w, char *k);
+int             ewl_theme_data_int_get(Ewl_Widget * w, char *k);
+void            ewl_theme_data_str_set(Ewl_Widget * w, char *k, char *v);
+void            ewl_theme_data_int_set(Ewl_Widget * w, char *k, int v);
+void            ewl_theme_data_default_str_set(char *k, char *v);
+void            ewl_theme_data_default_int_set(char *k, int v);
 
 /**
  * @}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- ewl_widget.c        13 Aug 2004 00:41:14 -0000      1.117
+++ ewl_widget.c        18 Aug 2004 03:04:33 -0000      1.118
@@ -37,7 +37,7 @@
        /*
         * Set up the necessary theme structures 
         */
-       if (!ewl_theme_init_widget(w))
+       if (!ewl_theme_widget_init(w))
                DRETURN_INT(FALSE, DLEVEL_STABLE);
 
        ewl_object_state_remove(EWL_OBJECT(w), EWL_FLAGS_STATE_MASK);
@@ -933,7 +933,7 @@
        /*
         * Free up appearance related information
         */
-       ewl_theme_shutdown_widget(w);
+       ewl_theme_widget_shutdown(w);
        IF_FREE(w->appearance);
 
        /*
@@ -1056,7 +1056,7 @@
         * theme file.
         */
        i = ewl_theme_image_get(w, "file");
-       group = ewl_theme_data_get_str(w, "group");
+       group = ewl_theme_data_str_get(w, "group");
 
        if (group) {
                emb = ewl_embed_find_by_widget(w);




-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to