Enlightenment CVS committal

Author  : codewarrior
Project : e17
Module  : libs/evolve

Dir     : e17/libs/evolve/src/lib


Modified Files:
        evolve_constructor.c evolve_gui.c evolve_lib.c evolve_parse.c 
        evolve_widget.c evolve_widget.h 


Log Message:
Evolve works again. No need for eet's union, moving away from etk specific
data structures. Code is NOT organized now, will follow shortly.


===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_constructor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evolve_constructor.c        14 Jul 2007 00:13:16 -0000      1.2
+++ evolve_constructor.c        8 Feb 2008 05:31:20 -0000       1.3
@@ -178,7 +178,7 @@
    Evolve_Widget *widget;

    

    widget = evolve_button_new();

-   evolve_widget_property_set(widget, "label", "button", ETK_PROPERTY_STRING);

+   evolve_widget_property_set(widget, "label", "button", 
EVOLVE_PROPERTY_STRING);

    return widget;

 }

 

@@ -189,7 +189,7 @@
    Evolve_Widget *widget;

    

    widget = evolve_check_button_new();

-   evolve_widget_property_set(widget, "label", "check button", 
ETK_PROPERTY_STRING);

+   evolve_widget_property_set(widget, "label", "check button", 
EVOLVE_PROPERTY_STRING);

    return widget;

 }

 

@@ -229,7 +229,7 @@
    Etk_Widget *button;

    

    widget = evolve_frame_new();

-   evolve_widget_property_set(widget, "label", "frame", ETK_PROPERTY_STRING);

+   evolve_widget_property_set(widget, "label", "frame", 
EVOLVE_PROPERTY_STRING);

    button = etk_button_new();

    etk_widget_size_request_set(button, 64, 64);

    etk_widget_theme_set(button,

@@ -263,7 +263,7 @@
    Evolve_Widget *widget;

    

    widget = evolve_label_new();

-   evolve_widget_property_set(widget, "label", "label", ETK_PROPERTY_STRING);

+   evolve_widget_property_set(widget, "label", "label", 
EVOLVE_PROPERTY_STRING);

    return widget;   

 }

 

@@ -549,7 +549,7 @@
    evolve->widgets = evas_list_append(evolve->widgets, widget);

    etk_signal_connect("mouse-down", ETK_OBJECT(widget->widget),

                      ETK_CALLBACK(evolve_gui_mouse_down_select_cb), widget);

-   evolve_widget_property_set(widget, "title", widget->name, 
ETK_PROPERTY_STRING);

+   evolve_widget_property_set(widget, "title", widget->name, 
EVOLVE_PROPERTY_STRING);

    return widget;

 }

   

===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_gui.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evolve_gui.c        18 Jun 2007 22:31:38 -0000      1.1
+++ evolve_gui.c        8 Feb 2008 05:31:20 -0000       1.2
@@ -184,9 +184,9 @@
 
    for (l = list; l; l = l->next)
      {
-       Etk_Property *prop;
-       Etk_Property *eprop;
-       Etk_Property *p;
+       Evolve_Property *prop;
+       Evolve_Property *eprop;
+       Evolve_Property *p;
        Etk_String *value;
        Etk_Widget *vwidget;
        
@@ -205,31 +205,31 @@
        
        switch(prop->type)
          {
-          case ETK_PROPERTY_INT:
-            value = etk_string_new_printf("%d", 
etk_property_value_int_get(p->default_value));
-            vwidget = etk_spinner_new(0, 9999, 
etk_property_value_int_get(p->default_value), 1, 10);
+          case EVOLVE_PROPERTY_INT:
+            value = etk_string_new_printf("%d", 
evolve_property_value_int_get(p->default_value));
+            vwidget = etk_spinner_new(0, 9999, 
evolve_property_value_int_get(p->default_value), 1, 10);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "prop", p, NULL);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "widget", widget, 
NULL);
             etk_signal_connect("value-changed", ETK_OBJECT(vwidget),
                                
ETK_CALLBACK(evolve_gui_property_spinner_value_changed_cb),
                                NULL);
             break;
-          case ETK_PROPERTY_BOOL:
-            value = etk_string_new_printf("%d", 
etk_property_value_bool_get(p->default_value));
+          case EVOLVE_PROPERTY_BOOL:
+            value = etk_string_new_printf("%d", 
evolve_property_value_bool_get(p->default_value));
             vwidget = etk_combobox_new_default();
               {
                  Etk_Combobox_Item *item;
                  
                  item = etk_combobox_item_append(ETK_COMBOBOX(vwidget), 
"True");
-                 if (etk_property_value_bool_get(p->default_value))
+                 if (evolve_property_value_bool_get(p->default_value))
                    etk_combobox_active_item_set(ETK_COMBOBOX(vwidget), item);
                  item = etk_combobox_item_append(ETK_COMBOBOX(vwidget), 
"False");
-                 if (!etk_property_value_bool_get(p->default_value))
+                 if (!evolve_property_value_bool_get(p->default_value))
                    etk_combobox_active_item_set(ETK_COMBOBOX(vwidget), item);  
          
               }
             break;
-          case ETK_PROPERTY_CHAR:
-            value = etk_string_new_printf("%c", 
etk_property_value_char_get(p->default_value));
+          case EVOLVE_PROPERTY_CHAR:
+            value = etk_string_new_printf("%c", 
evolve_property_value_char_get(p->default_value));
             vwidget = etk_entry_new();
             etk_entry_text_set(ETK_ENTRY(vwidget), etk_string_get(value));
             etk_object_data_set_full(ETK_OBJECT(vwidget), "prop", p, NULL);
@@ -237,9 +237,9 @@
                                
ETK_CALLBACK(evolve_gui_property_entry_text_changed_cb),
                                widget);
             break;               
-          case ETK_PROPERTY_FLOAT:
-            value = etk_string_new_printf("%f", 
etk_property_value_float_get(p->default_value));
-            vwidget = etk_spinner_new(0.0, 9999.0, 
etk_property_value_float_get(p->default_value), 0.1, 1.0);
+          case EVOLVE_PROPERTY_FLOAT:
+            value = etk_string_new_printf("%f", 
evolve_property_value_float_get(p->default_value));
+            vwidget = etk_spinner_new(0.0, 9999.0, 
evolve_property_value_float_get(p->default_value), 0.1, 1.0);
             etk_spinner_digits_set(ETK_SPINNER(vwidget), 1);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "prop", p, NULL);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "widget", widget, 
NULL);
@@ -247,9 +247,9 @@
                                
ETK_CALLBACK(evolve_gui_property_spinner_value_changed_cb),
                                NULL);
             break;
-          case ETK_PROPERTY_DOUBLE:
-            value = etk_string_new_printf("%g", 
etk_property_value_double_get(p->default_value));
-            vwidget = etk_spinner_new(0.0, 9999.0, 
etk_property_value_double_get(p->default_value), 0.1, 1.0);
+          case EVOLVE_PROPERTY_DOUBLE:
+            value = etk_string_new_printf("%g", 
evolve_property_value_double_get(p->default_value));
+            vwidget = etk_spinner_new(0.0, 9999.0, 
evolve_property_value_double_get(p->default_value), 0.1, 1.0);
             etk_spinner_digits_set(ETK_SPINNER(vwidget), 1);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "prop", p, NULL);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "widget", widget, 
NULL);
@@ -257,32 +257,32 @@
                                
ETK_CALLBACK(evolve_gui_property_spinner_value_changed_cb),
                                NULL);
             break;
-          case ETK_PROPERTY_SHORT:
-            value = etk_string_new_printf("%d", 
etk_property_value_short_get(p->default_value));
-            vwidget = etk_spinner_new(0, 9999, 
etk_property_value_short_get(p->default_value), 1, 10);
+          case EVOLVE_PROPERTY_SHORT:
+            value = etk_string_new_printf("%d", 
evolve_property_value_short_get(p->default_value));
+            vwidget = etk_spinner_new(0, 9999, 
evolve_property_value_short_get(p->default_value), 1, 10);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "prop", p, NULL);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "widget", widget, 
NULL);
             etk_signal_connect("value-changed", ETK_OBJECT(vwidget),
                                
ETK_CALLBACK(evolve_gui_property_spinner_value_changed_cb),
                                NULL);       
             break;
-          case ETK_PROPERTY_LONG:
-            value = etk_string_new_printf("%li", 
etk_property_value_long_get(p->default_value));
-            vwidget = etk_spinner_new(0, 9999, 
etk_property_value_long_get(p->default_value), 1, 10);
+          case EVOLVE_PROPERTY_LONG:
+            value = etk_string_new_printf("%li", 
evolve_property_value_long_get(p->default_value));
+            vwidget = etk_spinner_new(0, 9999, 
evolve_property_value_long_get(p->default_value), 1, 10);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "prop", p, NULL);
             etk_object_data_set_full(ETK_OBJECT(vwidget), "widget", widget, 
NULL);
             etk_signal_connect("value-changed", ETK_OBJECT(vwidget),
                                
ETK_CALLBACK(evolve_gui_property_spinner_value_changed_cb),
                                NULL);
             break;
-          case ETK_PROPERTY_POINTER:
+          case EVOLVE_PROPERTY_POINTER:
             value = etk_string_new_printf("cant cast PROPERTY_POINTER");
             vwidget = etk_entry_new();
             etk_entry_text_set(ETK_ENTRY(vwidget), etk_string_get(value));
             etk_widget_disabled_set(vwidget, ETK_TRUE);
             break;               
-          case ETK_PROPERTY_STRING:
-            value = etk_string_new_printf("%s", 
etk_property_value_string_get(p->default_value));
+          case EVOLVE_PROPERTY_STRING:
+            value = etk_string_new_printf("%s", 
evolve_property_value_string_get(p->default_value));
             vwidget = etk_entry_new();
             etk_entry_text_set(ETK_ENTRY(vwidget), etk_string_get(value));
             etk_entry_text_set(ETK_ENTRY(vwidget), etk_string_get(value));
@@ -382,7 +382,7 @@
 static void evolve_gui_property_entry_text_changed_cb(Etk_Object *object, void 
*data)
 {
    Evolve_Widget *widget;
-   Etk_Property *prop;
+   Evolve_Property *prop;
    
    prop = etk_object_data_get(object, "prop");
    widget = data;
@@ -393,7 +393,7 @@
 static void evolve_gui_property_spinner_value_changed_cb(Etk_Range *range, 
double value)
 {
    Etk_Spinner *spinner;
-   Etk_Property *prop;
+   Evolve_Property *prop;
    Evolve_Widget *widget;
    char value_str[64];
    
===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_lib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evolve_lib.c        23 Oct 2007 17:59:08 -0000      1.3
+++ evolve_lib.c        8 Feb 2008 05:31:20 -0000       1.4
@@ -26,19 +26,16 @@
             }

 

 #define EVOLVE_WIDGET_PROP_NEWI(str, it, type) \

-   EET_DATA_DESCRIPTOR_ADD_BASIC(_evolve_widget_prop_edd, Etk_Property, str, 
it, type)

+   EET_DATA_DESCRIPTOR_ADD_BASIC(_evolve_widget_prop_edd, Evolve_Property, 
str, it, type)

 

 #define EVOLVE_WIDGET_PROP_NEWS(str, it, type) \

-   EET_DATA_DESCRIPTOR_ADD_SUB(_evolve_widget_prop_edd, Etk_Property, str, it, 
type)

+   EET_DATA_DESCRIPTOR_ADD_SUB(_evolve_widget_prop_edd, Evolve_Property, str, 
it, type)

 

 #define PROP_DEF_VAL_NEWI(str, it, type) \

-   EET_DATA_DESCRIPTOR_ADD_BASIC(_prop_def_val_edd, Etk_Property_Value, str, 
it, type)

+   EET_DATA_DESCRIPTOR_ADD_BASIC(_prop_def_val_edd, Evolve_Property_Value, 
str, it, type)

   

 #define PROP_DEF_VAL_NEWS(str, it, type) \

-   EET_DATA_DESCRIPTOR_ADD_SUB(_prop_def_val_edd, Etk_Property_Value, str, it, 
type)

-

-#define PROP_DEF_VAL_VALUE_NEWI(str, it, type) \

-   EET_DATA_DESCRIPTOR_ADD_BASIC(_prop_def_val_value_edd, Etk_Property_Value, 
str, it, type)

+   EET_DATA_DESCRIPTOR_ADD_SUB(_prop_def_val_edd, Evolve_Property_Value, str, 
it, type)

 

 #define EVOLVE_WIDGET_PACKING_PROP_NEWI(str, it, type) \

    EET_DATA_DESCRIPTOR_ADD_BASIC(_evolve_widget_packing_prop_edd, 
Evolve_Widget_Property, str, it, type)

@@ -72,7 +69,6 @@
 

 static Eet_Data_Descriptor *_evolve_widget_prop_edd = NULL;

 static Eet_Data_Descriptor *_prop_def_val_edd = NULL;

-static Eet_Data_Descriptor *_prop_def_val_value_edd = NULL;

 static Eet_Data_Descriptor *_evolve_widget_packing_prop_edd = NULL;

 static Eet_Data_Descriptor *_evolve_widget_signal_edd = NULL;

 static Eet_Data_Descriptor *_evolve_widget_edd = NULL;

@@ -88,25 +84,21 @@
    evas_init();

    ecore_file_init();

    

-   _prop_def_val_value_edd = NEWD("Etk_Property_Value", Etk_Property_Value);

-   PROP_DEF_VAL_VALUE_NEWI("iv", value.int_value, EET_T_INT);

-   PROP_DEF_VAL_VALUE_NEWI("ib", value.bool_value, EET_T_INT);

-   PROP_DEF_VAL_VALUE_NEWI("cv", value.char_value, EET_T_CHAR);

-   PROP_DEF_VAL_VALUE_NEWI("fv", value.float_value, EET_T_FLOAT);

-   PROP_DEF_VAL_VALUE_NEWI("dv", value.double_value, EET_T_DOUBLE);

-   PROP_DEF_VAL_VALUE_NEWI("sv", value.short_value, EET_T_SHORT);

-   PROP_DEF_VAL_VALUE_NEWI("lv", value.long_value, EET_T_LONG_LONG);

-   PROP_DEF_VAL_VALUE_NEWI("tv", value.string_value, EET_T_STRING);

-   

-   _prop_def_val_edd = NEWD("Etk_Property_Value", Etk_Property_Value);

-   PROP_DEF_VAL_NEWS("va", value, _prop_def_val_value_edd);

+   _prop_def_val_edd = NEWD("Evolve_Property_Value", Evolve_Property_Value);

+        PROP_DEF_VAL_NEWI("iv", int_value, EET_T_INT);

+   PROP_DEF_VAL_NEWI("ib", bool_value, EET_T_INT);

+   PROP_DEF_VAL_NEWI("cv", char_value, EET_T_CHAR);

+   PROP_DEF_VAL_NEWI("fv", float_value, EET_T_FLOAT);

+   PROP_DEF_VAL_NEWI("dv", double_value, EET_T_DOUBLE);

+   PROP_DEF_VAL_NEWI("sv", short_value, EET_T_SHORT);

+   PROP_DEF_VAL_NEWI("lv", long_value, EET_T_LONG_LONG);

+   PROP_DEF_VAL_NEWI("tv", string_value, EET_T_STRING);

    PROP_DEF_VAL_NEWI("ty", type, EET_T_INT);   

    

-   _evolve_widget_prop_edd = NEWD("Etk_Property", Etk_Property);

+   _evolve_widget_prop_edd = NEWD("Evolve_Property", Evolve_Property);

    EVOLVE_WIDGET_PROP_NEWI("nm", name, EET_T_STRING);

    EVOLVE_WIDGET_PROP_NEWI("id", id, EET_T_INT);

    EVOLVE_WIDGET_PROP_NEWI("tp", type, EET_T_INT);

-   EVOLVE_WIDGET_PROP_NEWI("fl", flags, EET_T_INT);

    EVOLVE_WIDGET_PROP_NEWS("dv", default_value, _prop_def_val_edd);

    

    _evolve_widget_packing_prop_edd = NEWD("Evolve_Widget_Property", 
Evolve_Widget_Property);

@@ -144,7 +136,6 @@
 {

    FREED(_evolve_widget_prop_edd);

    FREED(_prop_def_val_edd);

-   FREED(_prop_def_val_value_edd);

    FREED(_evolve_widget_packing_prop_edd);   

    FREED(_evolve_widget_signal_edd);   

    FREED(_evolve_widget_edd);

@@ -328,7 +319,7 @@
    for (l = evolve->widgets ;l; l = l->next)

      {

        Evolve_Widget *widget;

-       Etk_Property *prop;

+       Evolve_Property *prop;

        Evas_Object *image;

        void *image_data = NULL;

        int image_w;

@@ -342,13 +333,13 @@
        if (!strcmp(widget->type, "image"))

          {

             if ( !(prop = evas_hash_find(widget->props, "file")) ||

-                 !prop->default_value || 
!ecore_file_exists(etk_property_value_string_get(prop->default_value)))

+                 !prop->default_value || 
!ecore_file_exists(evolve_property_value_string_get(prop->default_value)))

               continue;

          }

        else if (!strcmp(widget->type, "button"))

          {

             if ( !(prop = evas_hash_find(widget->props, "image")) ||

-                 !prop->default_value || 
!ecore_file_exists(etk_property_value_string_get(prop->default_value)))

+                 !prop->default_value || 
!ecore_file_exists(evolve_property_value_string_get(prop->default_value)))

               continue;             

          }

        else

@@ -374,7 +365,7 @@
          }

        

        image = evas_object_image_add(evas);

-       evas_object_image_file_set(image, 
etk_property_value_string_get(prop->default_value), NULL);

+       evas_object_image_file_set(image, 
evolve_property_value_string_get(prop->default_value), NULL);

        image_data = evas_object_image_data_get(image, 1);

        

        if (!image_data)

@@ -383,12 +374,12 @@
             continue;       

          }

        

-       snprintf(key, sizeof(key), "/etk/images/%s", 
etk_property_value_string_get(prop->default_value));

+       snprintf(key, sizeof(key), "/etk/images/%s", 
evolve_property_value_string_get(prop->default_value));

        evas_object_image_size_get(image, &image_w, &image_h);

 

        ret = eet_data_image_write(ef, key, image_data, image_w, image_h, 1, 1, 
100, 0);

        if (!ret)

-         fprintf(stderr, "Error writing image to eet: %s\n", 
etk_property_value_string_get(prop->default_value));

+         fprintf(stderr, "Error writing image to eet: %s\n", 
evolve_property_value_string_get(prop->default_value));

        evas_object_del(image); 

      }

       

===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_parse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evolve_parse.c      18 Jun 2007 22:31:38 -0000      1.1
+++ evolve_parse.c      8 Feb 2008 05:31:20 -0000       1.2
@@ -65,7 +65,7 @@
    if (!evolve_widget_type_property_exists(last_widget->type, prop))

      return 0;

    

-   evolve_widget_property_set(last_widget, prop, value, ETK_PROPERTY_INT);

+   evolve_widget_property_set(last_widget, prop, value, EVOLVE_PROPERTY_INT);

    return 1;

 }

 

@@ -79,7 +79,7 @@
    if (!evolve_widget_type_property_exists(last_widget->type, prop))

      return 0;   

 

-   evolve_widget_property_set(last_widget, prop, value, ETK_PROPERTY_STRING);

+   evolve_widget_property_set(last_widget, prop, value, 
EVOLVE_PROPERTY_STRING);

    return 1;

 }

 

===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_widget.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evolve_widget.c     25 Jul 2007 17:00:59 -0000      1.3
+++ evolve_widget.c     8 Feb 2008 05:31:20 -0000       1.4
@@ -40,6 +40,105 @@
 static Evas_Bool evolve_widget_code_get_packing_props_foreach(Evas_Hash *hash, 
const char *key, void *data, void *fdata);

 static Evas_Bool evolve_widget_code_get_props_foreach(Evas_Hash *hash, const 
char *key, void *data, void *fdata);

 

+/* temp until we support unions in eet */

+

+Evolve_Property_Type evolve_property_type_get(Evolve_Property *property)

+{

+       if (!property || !property->default_value)

+               return EVOLVE_PROPERTY_UNKNOWN;

+

+       return property->default_value->type;

+}

+

+Evolve_Property_Value *evolve_property_value_new()

+{

+       Evolve_Property_Value *value = calloc(1, sizeof(Evolve_Property_Value));

+       value->type = EVOLVE_PROPERTY_UNKNOWN;

+       return value;

+}

+Evolve_Property_Value *evolve_property_value_string(const char *value)

+{

+   Evolve_Property_Value *new_value;

+   new_value = evolve_property_value_new();

+        new_value->string_value = value ? strdup(value) : NULL;

+        new_value->type = EVOLVE_PROPERTY_STRING;

+   return new_value;

+}

+Evolve_Property_Value *evolve_property_value_double(double value)

+{

+   Evolve_Property_Value *new_value;

+   new_value = evolve_property_value_new();

+        new_value->double_value = value;

+        new_value->type = EVOLVE_PROPERTY_DOUBLE;

+   return new_value;

+}

+Evolve_Property_Value *evolve_property_value_int(int value)

+{

+   Evolve_Property_Value *new_value;

+   new_value = evolve_property_value_new();

+        new_value->int_value = value;

+        new_value->type = EVOLVE_PROPERTY_INT;

+   return new_value;

+}

+const char *evolve_property_value_string_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return NULL;

+       return value->string_value;

+}

+Etk_Bool evolve_property_value_bool_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return ETK_FALSE;

+       return value->bool_value;

+}

+long int evolve_property_value_long_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return 0;

+       return value->long_value;

+}

+char evolve_property_value_char_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return 0;

+       return value->char_value;

+}

+float evolve_property_value_float_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return 0;

+       return value->float_value;

+}

+short int evolve_property_value_short_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return 0;

+       return value->short_value;

+}

+int evolve_property_value_int_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return 0;

+       return value->int_value;

+}

+double evolve_property_value_double_get(Evolve_Property_Value *value)

+{

+       if (!value)

+               return 0;

+       return value->double_value;

+}

+void evolve_property_value_delete(Evolve_Property_Value *value)

+{

+       if (!value)

+               return;

+       if (value->string_value) free(value->string_value);

+       free(value);

+}

+

+

+

+

 /* populate widget packing info hashes (used at init time) */

 void evolve_widget_packing_info_populate()

 {

@@ -223,11 +322,11 @@
 }

 

 /* apply an internal property to the given widget, return 1 on success, 0 
otherwise */

-int evolve_widget_internal_property_apply(Evolve_Widget *widget, Etk_Property 
*prop)

+int evolve_widget_internal_property_apply(Evolve_Widget *widget, 
Evolve_Property *prop)

 {

    if (!strcmp(prop->name, "show_all"))

      {

-       if (etk_property_value_int_get(prop->default_value) == 1)

+       if (evolve_property_value_int_get(prop->default_value) == 1)

          _evolve_widgets_show_all = evas_list_append(_evolve_widgets_show_all, 
widget);

        return 1;

      }

@@ -238,7 +337,7 @@
      {

        char key[PATH_MAX];

                

-       snprintf(key, sizeof(key), "/etk/images/%s", 
etk_property_value_string_get(prop->default_value));

+       snprintf(key, sizeof(key), "/etk/images/%s", 
evolve_property_value_string_get(prop->default_value));

        if (!strcmp(widget->type, "image"))

          etk_image_set_from_file(ETK_IMAGE(widget->widget), 
_evolve_ev->eet_filename, key);

        else if (!strcmp(widget->type, "button"))

@@ -254,15 +353,15 @@
      {

        char file[PATH_MAX];

        

-       if 
(ecore_file_exists(etk_property_value_string_get(prop->default_value)))

-         snprintf(file, sizeof(file), "%s", 
etk_property_value_string_get(prop->default_value));

+       if 
(ecore_file_exists(evolve_property_value_string_get(prop->default_value)))

+         snprintf(file, sizeof(file), "%s", 
evolve_property_value_string_get(prop->default_value));

        else if (_evolve_ev && _evolve_ev->eet_filename)

          {

             char *dir;

             

             if ((dir = ecore_file_dir_get(_evolve_ev->eet_filename)))

               {

-                 snprintf(file, sizeof(file), "%s/%s", dir, 
etk_property_value_string_get(prop->default_value));

+                 snprintf(file, sizeof(file), "%s/%s", dir, 
evolve_property_value_string_get(prop->default_value));

                  free(dir);

                  if (ecore_file_exists(file))

                    goto prop_set;

@@ -272,7 +371,7 @@
        else

          {

 last_attemp:

-            snprintf(file, sizeof(file), "./%s", 
etk_property_value_string_get(prop->default_value));

+            snprintf(file, sizeof(file), "./%s", 
evolve_property_value_string_get(prop->default_value));

          }       

        

 prop_set:      

@@ -291,10 +390,10 @@
          return 1;

        

        etk_widget_parent_set(widget->widget, swallow_parent->widget);

-       if (!etk_widget_swallow_widget(swallow_parent->widget, 
etk_property_value_string_get(prop->default_value), widget->widget))

+       if (!etk_widget_swallow_widget(swallow_parent->widget, 
evolve_property_value_string_get(prop->default_value), widget->widget))

          fprintf(stderr, "EVOLVE WARNING!!\n"

                  "Could not swallow widget %s into part %s of widget %s: Error 
code %d\n",

-                 widget->name, 
etk_property_value_string_get(prop->default_value), swallow_parent->name,

+                 widget->name, 
evolve_property_value_string_get(prop->default_value), swallow_parent->name,

                  etk_widget_swallow_error_get());

        return 1;

      }

@@ -312,7 +411,7 @@
 }

 

 /* apply all the properties on the given widget */

-void evolve_widget_property_apply(Evolve_Widget *widget, Etk_Property *prop)

+void evolve_widget_property_apply(Evolve_Widget *widget, Evolve_Property *prop)

 {

    if (!widget || !widget->props)

      return;

@@ -323,20 +422,20 @@
    if (evolve_widget_internal_property_apply(widget, prop))

      return;

    

-   switch (etk_property_type_get(prop))

+   switch (evolve_property_type_get(prop))

      {

-      case ETK_PROPERTY_INT:

-       etk_object_properties_set(ETK_OBJECT(widget->widget), prop->name, 
etk_property_value_int_get(prop->default_value), NULL);

+      case EVOLVE_PROPERTY_INT:

+       etk_object_properties_set(ETK_OBJECT(widget->widget), prop->name, 
evolve_property_value_int_get(prop->default_value), NULL);

        break;

-      case ETK_PROPERTY_DOUBLE:

-       etk_object_properties_set(ETK_OBJECT(widget->widget), prop->name, 
etk_property_value_double_get(prop->default_value), NULL);

+      case EVOLVE_PROPERTY_DOUBLE:

+       etk_object_properties_set(ETK_OBJECT(widget->widget), prop->name, 
evolve_property_value_double_get(prop->default_value), NULL);

        break;

-      case ETK_PROPERTY_STRING:

-       etk_object_properties_set(ETK_OBJECT(widget->widget), prop->name, 
etk_property_value_string_get(prop->default_value), NULL);

+      case EVOLVE_PROPERTY_STRING:

+       etk_object_properties_set(ETK_OBJECT(widget->widget), prop->name, 
evolve_property_value_string_get(prop->default_value), NULL);

        break;

       default:

        printf("Unkown property type: %s %s %d\n", widget->name, widget->type,

-              etk_property_type_get(prop));

+              evolve_property_type_get(prop));

        break;

      }         

 }

@@ -883,29 +982,32 @@
 /* set the given property on the given widget */

 void evolve_widget_property_set(Evolve_Widget *widget, char *name, char 
*value, int type)

 {

-   Etk_Property *prop;

+   Evolve_Property *prop;

    

    if (!widget)

      return;

    

    if (widget->props && (prop = evas_hash_find(widget->props, name)))     

-     etk_property_value_delete(prop->default_value);

+     evolve_property_value_delete(prop->default_value);

    else

      {

-       prop = etk_property_new(name, 1, type, ETK_PROPERTY_READABLE_WRITABLE, 
NULL);

+       prop = calloc(1, sizeof(Evolve_Property));

+       prop->name = strdup(name);

+       prop->type = type;

+       prop->default_value = NULL;

        widget->props = evas_hash_add(widget->props, name, prop);

      }

    

    switch(prop->type)

      {

-      case ETK_PROPERTY_INT:

-       prop->default_value = etk_property_value_int(atoi(value));

+      case EVOLVE_PROPERTY_INT:

+       prop->default_value = evolve_property_value_int(atoi(value));

        break;

-      case ETK_PROPERTY_DOUBLE:

-       prop->default_value = etk_property_value_double(atof(value));

+      case EVOLVE_PROPERTY_DOUBLE:

+       prop->default_value = evolve_property_value_double(atof(value));

        break;

-      case ETK_PROPERTY_STRING:

-       prop->default_value = etk_property_value_string(value); 

+      case EVOLVE_PROPERTY_STRING:

+       prop->default_value = evolve_property_value_string(value);      

        break;

       default:

        prop->default_value = NULL;

@@ -915,7 +1017,7 @@
 }

 

 /* find a property for the supplied widget, return it, or return NULL if not 
found */

-Etk_Property *evolve_widget_property_get(Evolve_Widget *widget, char 
*prop_name)

+Evolve_Property *evolve_widget_property_get(Evolve_Widget *widget, char 
*prop_name)

 {

    if (!widget || !widget->props)

      return NULL;

@@ -938,7 +1040,7 @@
 int evolve_widget_type_property_exists(char *type, char *prop_name)

 {   

    Etk_Type *property_owner;

-   Etk_Property *property;

+   Evolve_Property *property;

    

    if (etk_type_property_find(evolve_widget_type_to_etk(type), prop_name, 

                              &property_owner, &property)

@@ -986,7 +1088,7 @@
 static Evas_Bool evolve_widget_properties_apply_foreach(Evas_Hash *hash, const 
char *key, void *data, void *fdata)

 {

    Evolve_Widget *widget;

-   Etk_Property *prop;

+   Evolve_Property *prop;

    

    widget = fdata;

    prop = data;

===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_widget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evolve_widget.h     18 Jun 2007 22:31:38 -0000      1.1
+++ evolve_widget.h     8 Feb 2008 05:31:20 -0000       1.2
@@ -6,6 +6,26 @@
 typedef struct _Evolve_Widget_Packing_Info Evolve_Widget_Packing_Info;

 typedef struct _Evolve_Widget_Type Evolve_Widget_Type;

 

+/* temporary until we fix eet to store unions */

+typedef struct _Evolve_Property Evolve_Property;

+typedef struct _Evolve_Property_Value Evolve_Property_Value;

+

+typedef enum _Evolve_Property_Type

+{

+       EVOLVE_PROPERTY_UNKNOWN,

+       EVOLVE_PROPERTY_INT,

+       EVOLVE_PROPERTY_BOOL,

+       EVOLVE_PROPERTY_CHAR,

+       EVOLVE_PROPERTY_FLOAT,

+       EVOLVE_PROPERTY_DOUBLE,

+       EVOLVE_PROPERTY_SHORT,

+       EVOLVE_PROPERTY_LONG,

+       EVOLVE_PROPERTY_OBJECT,

+       EVOLVE_PROPERTY_POINTER,

+       EVOLVE_PROPERTY_STRING

+} Evolve_Property_Type;

+

+

 struct _Evolve_Widget_Packing_Option_Value

 {

    int value;

@@ -30,6 +50,39 @@
       Evas_Hash *internal_props;

 };

 

+struct _Evolve_Property

+{

+   char *name;

+   int id;

+   Evolve_Property_Type type;

+   Evolve_Property_Value *default_value;

+};

+

+struct _Evolve_Property_Value

+{

+        int int_value;

+   int bool_value;

+   char char_value;

+   float float_value;

+   double double_value;

+   short short_value;

+   long long_value;

+   char *string_value;

+        int type;

+};

+

+/* temp */

+const char *evolve_property_value_string_get(Evolve_Property_Value *value);

+int evolve_property_value_int_get(Evolve_Property_Value *value);

+short int evolve_property_value_short_get(Evolve_Property_Value *value);

+long int evolve_property_value_long_get(Evolve_Property_Value *value);

+Etk_Bool evolve_property_value_bool_get(Evolve_Property_Value *value);

+double evolve_property_value_double_get(Evolve_Property_Value *value);

+char evolve_property_value_char_get(Evolve_Property_Value *value);

+float evolve_property_value_float_get(Evolve_Property_Value *value);

+void evolve_property_value_delete_get(Evolve_Property_Value *value);

+

+

 void evolve_widget_packing_info_populate();

 void evolve_widget_types_populate();

 

@@ -38,9 +91,9 @@
 

 Evolve_Ctor evolve_widget_ctor_find(char *type); 

   

-int  evolve_widget_internal_property_apply(Evolve_Widget *widget, Etk_Property 
*prop);

+int  evolve_widget_internal_property_apply(Evolve_Widget *widget, 
Evolve_Property *prop);

 void evolve_widget_properties_apply(Evolve_Widget *widget);

-void evolve_widget_property_apply(Evolve_Widget *widget, Etk_Property *prop);

+void evolve_widget_property_apply(Evolve_Widget *widget, Evolve_Property 
*prop);

 

 int  evolve_widget_internal_render(Evolve_Widget *widget);

 void evolve_widget_post_render(Evolve_Widget *widget);

@@ -61,7 +114,7 @@
 Evas_List *evolve_widget_list_sort(Evas_List *widgets);

 

 void evolve_widget_property_set(Evolve_Widget *widget, char *name, char 
*value, int type);

-Etk_Property *evolve_widget_property_get(Evolve_Widget *widget, char 
*prop_name);

+Evolve_Property *evolve_widget_property_get(Evolve_Widget *widget, char 
*prop_name);

 

 Etk_Type *evolve_widget_type_to_etk(char *type);

 int evolve_widget_type_property_exists(char *type, char *prop_name);




-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to