Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : proto

Dir     : e17/proto/edje_editor/src/bin


Modified Files:
        callbacks.c callbacks.h evas.c interface.c interface.h main.h 


Log Message:
 * Various fixes 
 * Start work on edje_program support 

===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- callbacks.c 18 Jan 2007 02:07:38 -0000      1.10
+++ callbacks.c 19 Jan 2007 08:49:00 -0000      1.11
@@ -94,7 +94,7 @@
          //PlayEDC();
          break;
       case TOOLBAR_DEBUG:
-         DebugInfo(TRUE);
+         DebugInfo(FALSE);
          break;
       case TOOLBAR_IMAGE_FILE_ADD:
          ShowAlert("Not yet implemented =)");
@@ -120,7 +120,7 @@
 
    printf("Row Selected Signal on one of the Tree EMITTED \n");
 
-   //get the type of the row (group,part or desc) from the hidden col
+   //get the type of the row (group,part,desc or prog) from the hidden col
    etk_tree_row_fields_get(row,
       etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 2),&row_type,
       NULL);
@@ -128,7 +128,7 @@
    switch (row_type)
    {
       case ROW_GROUP:
-         printf("ROW_GROUP %d\n",Cur.eg);
+         Cur.epr = NULL;
          Cur.eg = etk_tree_row_data_get (row);
          Cur.ep = NULL;
          Cur.eps = NULL;
@@ -138,9 +138,11 @@
          etk_widget_hide(UI_ImageFrame);
          etk_widget_hide(UI_TextFrame);
          etk_widget_hide(UI_PartFrame);
+         etk_widget_hide(UI_ProgramFrame);
          etk_widget_show(UI_GroupFrame);
          break;
       case ROW_PART:
+         Cur.epr = NULL;
          Cur.ep = etk_tree_row_data_get (row);
          Cur.eg = Cur.ep->parent;
          Cur.eps = NULL;
@@ -150,10 +152,12 @@
          etk_widget_hide(UI_ImageFrame);
          etk_widget_hide(UI_TextFrame);
          etk_widget_hide(UI_GroupFrame);
+         etk_widget_hide(UI_ProgramFrame);
          etk_widget_show(UI_PartFrame);
          UpdatePartFrame();
          break;
-      case ROW_DESC:
+      case ROW_DESC: 
+         Cur.epr = NULL;
          Cur.eps = etk_tree_row_data_get (row);
          Cur.ep = Cur.eps->parent;
          Cur.eg = Cur.ep->parent;
@@ -192,10 +196,24 @@
 
          etk_widget_hide(UI_PartFrame);
          etk_widget_hide(UI_GroupFrame);
+         //etk_widget_hide(UI_ProgramFrame);
          etk_widget_show(UI_DescriptionFrame);
          etk_widget_show(UI_PositionFrame);
-
-
+         break;
+      case ROW_PROG:
+         Cur.epr = etk_tree_row_data_get (row);
+         Cur.eg = Cur.epr->parent;
+         Cur.ep = NULL;
+         Cur.eps = NULL;
+         etk_widget_hide(UI_DescriptionFrame);
+         etk_widget_hide(UI_PositionFrame);
+         etk_widget_hide(UI_RectFrame);
+         etk_widget_hide(UI_ImageFrame);
+         etk_widget_hide(UI_TextFrame);
+         etk_widget_hide(UI_GroupFrame);
+         etk_widget_hide(UI_PartFrame);
+         etk_widget_show(UI_ProgramFrame);
+         UpdateProgFrame();
          break;
    }
 
@@ -606,17 +624,6 @@
    ev_redraw();
 }
 
-void 
-on_TextAlphaSlider_value_changed(Etk_Object *object, double value, void *data)
-{
-   printf("value changed event on text alpha slider EMIT (value: 
%d)\n",(int)value);
-   if (Cur.eps)
-   {
-      engrave_part_state_color_set(Cur.eps, -1, -1, -1, (int)value);
-      ev_redraw();
-   }
-}
-
 /* Colors Callbacks */
 void
 on_ColorCanvas_realize(Etk_Widget *canvas, void *data)
@@ -628,7 +635,7 @@
    rect = evas_object_rectangle_add  (etk_widget_toplevel_evas_get(canvas));
    etk_canvas_object_add (ETK_CANVAS(canvas), rect);
    evas_object_color_set(rect, 100,100,100,255);
-   evas_object_resize(rect,30,30);
+   evas_object_resize(rect,300,300);
    etk_canvas_object_move(ETK_CANVAS(canvas),rect,0,0);
    evas_object_show(rect);
    evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, 
on_ColorCanvas_click, data);
@@ -684,44 +691,44 @@
 }
 
 void
-on_ColorAlphaSlider_value_changed(Etk_Object *object, double value, void *data)
-{
-   char string[256];
-   printf("ValueChangedSignal on ColorAlphaSlider EMITTED (value: %d)\n",(int) 
value);
-   Cur.eps->color.a = (int)value;
-
-   snprintf(string, 255, "%03.0f", value);
-   etk_label_set(ETK_LABEL(data), string);
-
-   
//evas_object_color_set(RectColorObject,selected_desc->color_r,selected_desc->color_g,selected_desc->color_b,255);
-   //ev_draw_part(Cur.eps->parent);
-   ev_redraw();
-
-}
-
-void
 on_ColorDialog_change(Etk_Object *object, void *data)
 {
-   printf("ColorChangeSignal on ColorDialog EMITTED\n");
+  // printf("ColorChangeSignal on ColorDialog EMITTED\n");
    Etk_Color color;
+   Etk_Color premuled;
 
    color = etk_colorpicker_current_color_get (ETK_COLORPICKER(object));
+ //  printf("Color: %d %d %d %d\n",color.r,color.g,color.b,color.a);
+
+   if (color.r > 255) color.r = 255;
+   if (color.g > 255) color.g = 255;
+   if (color.b > 255) color.b = 255;
+   if (color.a > 255) color.a = 255;
+
+   if (color.r < 0) color.r = 0;
+   if (color.g < 0) color.g = 0;
+   if (color.b < 0) color.b = 0;
+   if (color.a < 0) color.a = 0;
+
+   premuled = color;
+   evas_color_argb_premul(premuled.a,&premuled.r,&premuled.g,&premuled.b);
+
    switch (current_color_object){
     case COLOR_OBJECT_RECT:
-      evas_object_color_set(RectColorObject,color.r,color.g,color.b,255);
-      engrave_part_state_color_set(Cur.eps,color.r,color.g,color.b,-1);
+      
evas_object_color_set(RectColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
+      engrave_part_state_color_set(Cur.eps,color.r,color.g,color.b,color.a);
       break;
     case COLOR_OBJECT_TEXT:
-      evas_object_color_set(TextColorObject,color.r,color.g,color.b,255);
-      engrave_part_state_color_set(Cur.eps,color.r,color.g,color.b,-1);
+      
evas_object_color_set(TextColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
+      engrave_part_state_color_set(Cur.eps,color.r,color.g,color.b,color.a);
       break;
     case COLOR_OBJECT_SHADOW:
-      evas_object_color_set(ShadowColorObject,color.r,color.g,color.b,255);
-      engrave_part_state_color2_set(Cur.eps,color.r,color.g,color.b,255);
+      
evas_object_color_set(ShadowColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
+      engrave_part_state_color2_set(Cur.eps,color.r,color.g,color.b,color.a);
       break;
     case COLOR_OBJECT_OUTLINE:
-      evas_object_color_set(OutlineColorObject,color.r,color.g,color.b,255);
-      engrave_part_state_color3_set(Cur.eps,color.r,color.g,color.b,255);
+      
evas_object_color_set(OutlineColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
+      engrave_part_state_color3_set(Cur.eps,color.r,color.g,color.b,color.a);
       break;
    }
 
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- callbacks.h 18 Jan 2007 02:07:38 -0000      1.7
+++ callbacks.h 19 Jan 2007 08:49:00 -0000      1.8
@@ -7,7 +7,6 @@
 void on_GroupSpinner_value_changed     (Etk_Range *range, double value, void 
*data);
 void on_canvas_geometry_changed        (Etk_Object *canvas, const char 
*property_name, void *data);
 void on_PartsTree_row_selected         (Etk_Object *object, Etk_Tree_Row *row, 
void *data);
-void on_ColorAlphaSlider_value_changed (Etk_Object *object, double value, void 
*data);
 void on_ColorCanvas_click              (void *data, Evas *e, Evas_Object *obj, 
void *event_info);
 void on_ColorDialog_change             (Etk_Object *object, void *data);
 void on_PartNameEntry_text_changed     (Etk_Object *object, void *data);
@@ -31,7 +30,6 @@
 void on_EffectComboBox_changed         (Etk_Combobox *combobox, void *data);
 void on_AlertDialog_response           (Etk_Dialog *dialog, int response_id, 
void *data);
 void on_StateIndexSpinner_value_changed(Etk_Range *range, double value, void 
*data);
-void on_TextAlphaSlider_value_changed  (Etk_Object *object, double value, void 
*data);
 void on_GroupNameEntry_text_changed    (Etk_Object *object, void *data);
 void on_AspectSpinner_value_changed    (Etk_Range *range, double value, void 
*data);
 void on_AspectComboBox_changed         (Etk_Combobox *combobox, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas.c      14 Jan 2007 10:06:41 -0000      1.5
+++ evas.c      19 Jan 2007 08:49:00 -0000      1.6
@@ -159,6 +159,7 @@
    // Create Fake win
    EV_fakewin = edje_object_add(etk_widget_toplevel_evas_get(ETK_canvas));
    edje_object_file_set(EV_fakewin, EdjeFile, "FakeWin");
+   etk_canvas_object_add(ETK_canvas,EV_fakewin);
 
    
edje_object_signal_callback_add(EV_fakewin,"DRAG","miniarrow",on_Drag,(void*)DRAG_MINIARROW);
 
@@ -168,8 +169,7 @@
 
    //Create engrave canvas
    ecanvas = engrave_canvas_new (etk_widget_toplevel_evas_get(ETK_canvas));
-   //etk_canvas_object_add (ETK_CANVAS(ETK_canvas), ecanvas);
-   //etk_canvas_object_move (ETK_CANVAS(ETK_canvas),ecanvas,MAIN_LEFT, 
MAIN_TOP);
+   etk_canvas_object_add (ETK_CANVAS(ETK_canvas), ecanvas);
 }
 void
 ev_adjust_position(Engrave_Part_State* state, Evas_Object* object)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- interface.c 18 Jan 2007 02:07:38 -0000      1.12
+++ interface.c 19 Jan 2007 08:49:00 -0000      1.13
@@ -96,12 +96,34 @@
 }
 
 void
+AddProgramToTree(Engrave_Program* prog)
+{
+   Etk_Tree_Col *col1,*col2,*col3;
+   Etk_Tree_Row *row=NULL;
+
+   //printf("Add Program to tree: %s\n",prog->name);
+   col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0);
+   col2 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 1);
+   col3 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 2);
+
+   row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
+               ecore_hash_get(hash,prog->parent),
+               col1, EdjeFile,"PROG.PNG", prog->name,
+               col3,ROW_PROG,
+               NULL);
+
+   ecore_hash_set(hash, prog, row);
+   etk_tree_row_data_set(row, prog);
+}
+
+void
 PopulateTree(void)
 {
    Engrave_Group *group;
    Engrave_Part *part;
    Engrave_Part_State *state;
-   Evas_List *gp,*pp,*sp;
+   Engrave_Program *prog;
+   Evas_List *gp,*pp,*sp,*progp;
 
    for (gp = Cur.ef->groups; gp ;gp = gp->next)
    {
@@ -117,9 +139,13 @@
             state = sp->data;
             AddStateToTree(state);
            // printf(" **       State: %s \n",sta->name);
-
          }
       }
+      for (progp = group->programs; progp; progp = progp->next)
+      {
+            prog = progp->data;
+            AddProgramToTree(prog);
+      }
    }
 }
 
@@ -351,7 +377,6 @@
    if (Cur.eps){
       printf("Update Rect Frame: %s (%d %d %d 
%d)\n",Cur.eps->name,Cur.eps->color.r,Cur.eps->color.g,Cur.eps->color.b,Cur.eps->color.a);
 
-      etk_signal_block("value_changed", ETK_OBJECT(UI_ColorAlphaSlider), 
ETK_CALLBACK(on_ColorAlphaSlider_value_changed));
       etk_signal_block("color_changed", ETK_OBJECT(UI_ColorPicker), 
ETK_CALLBACK(on_ColorDialog_change));
 
       //Set ColorPicker
@@ -359,16 +384,12 @@
       color.g = Cur.eps->color.g;
       color.b = Cur.eps->color.b;
       color.a = Cur.eps->color.a;
-
       etk_colorpicker_current_color_set (ETK_COLORPICKER(UI_ColorPicker), 
color);
 
-      //Set alpha slider
-      etk_range_value_set(ETK_RANGE(UI_ColorAlphaSlider),Cur.eps->color.a);
-
       //Set Color rect
-      
evas_object_color_set(RectColorObject,Cur.eps->color.r,Cur.eps->color.g,Cur.eps->color.b,255);
+      evas_color_argb_premul(color.a,&color.r,&color.g,&color.b);
+      evas_object_color_set(RectColorObject,color.r,color.g,color.b,color.a);
 
-      etk_signal_unblock("value_changed", ETK_OBJECT(UI_ColorAlphaSlider), 
ETK_CALLBACK(on_ColorAlphaSlider_value_changed));
       etk_signal_unblock("color_changed", ETK_OBJECT(UI_ColorPicker), 
ETK_CALLBACK(on_ColorDialog_change));
    }
 }
@@ -439,7 +460,6 @@
       //Stop signal propagation
       
etk_signal_block("text_changed",ETK_OBJECT(UI_TextEntry),on_TextEntry_text_changed);
       etk_signal_block("active_item_changed", ETK_OBJECT(UI_FontComboBox), 
ETK_CALLBACK(on_FontComboBox_changed));
-      etk_signal_block("value_changed", ETK_OBJECT(UI_TextAlphaSlider), 
ETK_CALLBACK(on_TextAlphaSlider_value_changed));
 
       //Set Text Text in Cur.eps
       etk_entry_text_set(ETK_ENTRY(UI_TextEntry), 
@@ -464,11 +484,6 @@
       etk_range_value_set (ETK_RANGE(UI_FontSizeSpinner), 
          (float)engrave_part_state_text_size_get(Cur.eps));
 
-      //Set Text alpha
-      engrave_part_state_color_get(Cur.eps,NULL,NULL,NULL,&alpha);
-      etk_range_value_set (ETK_RANGE(UI_TextAlphaSlider),(float)alpha); 
-
-
       //Set Effect ComboBox
       switch (Cur.ep->effect)
       {
@@ -495,8 +510,6 @@
       //Renable  signal propagation
       etk_signal_unblock("text_changed", ETK_OBJECT(UI_TextEntry), 
ETK_CALLBACK(on_TextEntry_text_changed));
       etk_signal_unblock("active_item_changed", ETK_OBJECT(UI_FontComboBox), 
ETK_CALLBACK(on_FontComboBox_changed));
-      etk_signal_unblock("value_changed", ETK_OBJECT(UI_TextAlphaSlider), 
ETK_CALLBACK(on_TextAlphaSlider_value_changed));
-
    }
 }
 
@@ -648,6 +661,24 @@
    etk_signal_unblock("active_item_changed", ETK_OBJECT(UI_Rel2ToYComboBox), 
ETK_CALLBACK(on_RelToComboBox_changed));
 
 }
+void
+UpdateProgFrame(void)
+{
+   printf("Update Program\n");
+   if (!Cur.epr)
+      return;
+
+   //Update Program
+   etk_entry_text_set(ETK_ENTRY(UI_ProgramEntry),Cur.epr->name);
+
+   //Update Signal
+   etk_entry_text_set(ETK_ENTRY(UI_SignalEntry),Cur.epr->signal);
+
+   //Update Source
+   etk_entry_text_set(ETK_ENTRY(UI_SourceEntry),Cur.epr->source);
+
+
+}
 
 void UpdateWindowTitle(void){
 /*    GString *str;
@@ -759,7 +790,7 @@
 }
 
 Etk_Widget*
-create_a_color_button(char* label_text, int color_button_enum)
+create_a_color_button(char* label_text, int color_button_enum,int w,int h)
 {
    Etk_Widget *vbox;
    Etk_Widget *ColorCanvas;
@@ -772,16 +803,17 @@
    //shadow
    shadow = etk_shadow_new();
    etk_shadow_border_set(ETK_SHADOW(shadow), 0);
+   //etk_widget_size_request_set(shadow, 45, 45);
    etk_shadow_shadow_set(ETK_SHADOW(shadow),ETK_SHADOW_OUTSIDE, 
ETK_SHADOW_ALL, 10, 2, 2, 200);
    //etk_shadow_shadow_set(Etk_Shadow *shadow, Etk_Shadow_Type type, 
Etk_Shadow_Edges edges, int radius, int offset_x, int offset_y, int opacity);
-   etk_box_append(ETK_BOX(vbox), shadow, ETK_BOX_START, ETK_BOX_NONE, 0);
+   etk_box_append(ETK_BOX(vbox), shadow, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 
0);
 
    //ColorCanvas
    ColorCanvas = etk_canvas_new ();
-   etk_box_append(ETK_BOX(vbox), ColorCanvas, ETK_BOX_START, ETK_BOX_NONE, 0);
+  //etk_box_append(ETK_BOX(vbox), ColorCanvas, ETK_BOX_START, 
ETK_BOX_EXPAND_FILL, 0);
    etk_container_add(ETK_CONTAINER(shadow), ColorCanvas);
    etk_signal_connect("realize", ETK_OBJECT(ColorCanvas), 
ETK_CALLBACK(on_ColorCanvas_realize), (void*)color_button_enum);
-   etk_widget_size_request_set(ColorCanvas, 30, 30);
+   etk_widget_size_request_set(ColorCanvas, w, h);
 
    //Label
    if (label_text){
@@ -1164,37 +1196,12 @@
 Etk_Widget*
 create_rectangle_frame(void)
 {
-   Etk_Widget *vbox;
-   Etk_Widget *hbox;
-   Etk_Widget *label;
-
    //RectFrame
    UI_RectFrame = etk_frame_new("Rectangle");
 
-   //vbox
-   vbox = etk_vbox_new(ETK_FALSE, 0);
-   etk_container_add(ETK_CONTAINER(UI_RectFrame), vbox);
-
-   label = etk_label_new("<b>Color</b>");
-   etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
-   etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
-
-   //hbox
-   hbox = etk_hbox_new(ETK_FALSE, 10);
-   etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
-
-   //color button
-   etk_box_append(ETK_BOX(hbox), 
create_a_color_button(NULL,COLOR_OBJECT_RECT), ETK_BOX_START, ETK_BOX_NONE, 0);
-
-   //ColorAlphaSlider
-   label = etk_label_new("Alpha");
-   etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
-   UI_ColorAlphaSlider = etk_hslider_new (0, 255, 15, 1,20);
-   etk_box_append(ETK_BOX(hbox),UI_ColorAlphaSlider, ETK_BOX_START, 
ETK_BOX_EXPAND_FILL, 0);
-   UI_AlphaLabel = etk_label_new("000");
-   etk_box_append(ETK_BOX(hbox), UI_AlphaLabel, ETK_BOX_START, ETK_BOX_NONE, 
0);
-
-   etk_signal_connect("value_changed", ETK_OBJECT(UI_ColorAlphaSlider), 
ETK_CALLBACK(on_ColorAlphaSlider_value_changed), UI_AlphaLabel);
+   //color button 
+   etk_container_add(ETK_CONTAINER(UI_RectFrame),
+      create_a_color_button("Color",COLOR_OBJECT_RECT,100,30));
 
    return UI_RectFrame;
 }
@@ -1379,25 +1386,20 @@
    label = etk_label_new("Alpha");
    etk_table_attach_default (ETK_TABLE(table),label, 0, 0, 3,3);
 
-   //TextAlphaSlider
-   UI_TextAlphaSlider = etk_hslider_new (0, 255, 15, 1,20);
-   etk_table_attach_default (ETK_TABLE(table),UI_TextAlphaSlider, 1, 4, 3,3);
-
    //hbox
    hbox = etk_hbox_new(ETK_FALSE, 10);
    etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
 
    //Color buttons
-   etk_box_append(ETK_BOX(hbox), 
create_a_color_button("Text",COLOR_OBJECT_TEXT), ETK_BOX_START, ETK_BOX_EXPAND, 
0);
-   etk_box_append(ETK_BOX(hbox), 
create_a_color_button("Shadow",COLOR_OBJECT_SHADOW), ETK_BOX_START, 
ETK_BOX_EXPAND, 0);
-   etk_box_append(ETK_BOX(hbox), 
create_a_color_button("Outline",COLOR_OBJECT_OUTLINE), ETK_BOX_START, 
ETK_BOX_EXPAND, 0);
+   etk_box_append(ETK_BOX(hbox), 
create_a_color_button("Text",COLOR_OBJECT_TEXT,30,30), ETK_BOX_START, 
ETK_BOX_EXPAND, 0);
+   etk_box_append(ETK_BOX(hbox), 
create_a_color_button("Shadow",COLOR_OBJECT_SHADOW,30,30), ETK_BOX_START, 
ETK_BOX_EXPAND, 0);
+   etk_box_append(ETK_BOX(hbox), 
create_a_color_button("Outline",COLOR_OBJECT_OUTLINE,30,30), ETK_BOX_START, 
ETK_BOX_EXPAND, 0);
 
    etk_signal_connect("clicked", ETK_OBJECT(UI_FontAddButton), 
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_FONT_FILE_ADD);
    etk_signal_connect("active_item_changed", ETK_OBJECT(UI_FontComboBox), 
ETK_CALLBACK(on_FontComboBox_changed), NULL);
    etk_signal_connect("active_item_changed", ETK_OBJECT(UI_EffectComboBox), 
ETK_CALLBACK(on_EffectComboBox_changed), NULL);
    etk_signal_connect("value_changed", ETK_OBJECT(UI_FontSizeSpinner), 
ETK_CALLBACK(on_FontSizeSpinner_value_changed), NULL);
    etk_signal_connect("text_changed", ETK_OBJECT(UI_TextEntry), 
ETK_CALLBACK(on_TextEntry_text_changed), NULL);
-   etk_signal_connect("value_changed", ETK_OBJECT(UI_TextAlphaSlider), 
ETK_CALLBACK(on_TextAlphaSlider_value_changed), NULL);
 
    return UI_TextFrame;
 }
@@ -1452,7 +1454,7 @@
    etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
 
    //Rel1XSpinner
-   UI_Rel1XSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.01, 0.1);
+   UI_Rel1XSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
    etk_spinner_digits_set (ETK_SPINNER(UI_Rel1XSpinner), 2);
    etk_widget_size_request_set(UI_Rel1XSpinner,45, 20);
    etk_box_append(ETK_BOX(hbox),UI_Rel1XSpinner, ETK_BOX_START, ETK_BOX_NONE, 
0);
@@ -1484,7 +1486,7 @@
    etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
 
    //Rel1YSpinner
-   UI_Rel1YSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.01, 0.1);
+   UI_Rel1YSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
    etk_spinner_digits_set (ETK_SPINNER(UI_Rel1YSpinner), 2);
    etk_widget_size_request_set(UI_Rel1YSpinner, 45, 20);
    etk_box_append(ETK_BOX(hbox), UI_Rel1YSpinner, ETK_BOX_START, ETK_BOX_NONE, 
0);
@@ -1520,7 +1522,7 @@
    etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
 
    //Rel2XSpinner
-   UI_Rel2XSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.01, 0.1);
+   UI_Rel2XSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
    etk_spinner_digits_set (ETK_SPINNER(UI_Rel2XSpinner), 2);
    etk_widget_size_request_set(UI_Rel2XSpinner,45, 20);
    etk_box_append(ETK_BOX(hbox), UI_Rel2XSpinner, ETK_BOX_START, ETK_BOX_NONE, 
0);
@@ -1552,7 +1554,7 @@
    etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
 
    //Rel2YSpinner
-   UI_Rel2YSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.01, 0.1);
+   UI_Rel2YSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
    etk_spinner_digits_set (ETK_SPINNER(UI_Rel2YSpinner), 2);
    etk_widget_size_request_set(UI_Rel2YSpinner, 45, 20);
    etk_box_append(ETK_BOX(hbox), UI_Rel2YSpinner, ETK_BOX_START, ETK_BOX_NONE, 
0);
@@ -1631,6 +1633,83 @@
    return UI_PartFrame;
 }
 
+Etk_Widget*
+create_program_frame(void)
+{
+   Etk_Widget *table;
+   Etk_Widget *label;
+   //RectFrame
+   UI_ProgramFrame = etk_frame_new("Program");
+
+   //table
+   table = etk_table_new (4, 7, FALSE);
+   etk_container_add(ETK_CONTAINER(UI_ProgramFrame), table);
+
+   //UI_ProgramEntry
+   label = etk_label_new("<b>Name</b>");
+   etk_table_attach (ETK_TABLE(table), label, 0, 0, 0, 0,0,0,ETK_TABLE_NONE);
+   UI_ProgramEntry = etk_entry_new();
+   etk_table_attach_default (ETK_TABLE(table),UI_ProgramEntry, 1, 3, 0, 0);
+
+   //UI_SignalComboBox
+   label = etk_label_new("<b>Signal</b>");
+   etk_table_attach (ETK_TABLE(table), label, 0, 0, 1, 1,0,0,ETK_TABLE_NONE);
+   UI_SignalEntry = etk_entry_new();
+   etk_table_attach_default (ETK_TABLE(table),UI_SignalEntry, 1, 3, 1, 1);
+
+   //UI_SourceEntry
+   label = etk_label_new("<b>Source</b>");
+   etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2,0,0,ETK_TABLE_NONE);
+   UI_SourceEntry = etk_entry_new();
+   etk_table_attach_default(ETK_TABLE(table), UI_SourceEntry, 1, 3, 2, 2);
+   
+   label = etk_label_new("<b>Target</b>");
+   etk_table_attach(ETK_TABLE(table), label, 0, 0, 3, 3,0,0,ETK_TABLE_NONE);
+   UI_TargetEntry = etk_entry_new();
+   etk_table_attach_default(ETK_TABLE(table), UI_TargetEntry, 1, 3, 3, 3);
+
+   //UI_ActionComboBox
+   label = etk_label_new("<b>Action</b>");
+   etk_table_attach (ETK_TABLE(table), label, 0, 0, 4, 4,0,0,ETK_TABLE_NONE);
+   UI_ActionComboBox = etk_combobox_new();
+   etk_combobox_column_add(ETK_COMBOBOX(UI_ActionComboBox), 
ETK_COMBOBOX_IMAGE, 24, ETK_FALSE, ETK_TRUE, ETK_TRUE, 0.0, 0.5);
+   etk_combobox_column_add(ETK_COMBOBOX(UI_ActionComboBox), 
ETK_COMBOBOX_LABEL, 75, ETK_TRUE, ETK_FALSE, ETK_FALSE, 0.0, 0.5);
+   etk_combobox_build(ETK_COMBOBOX(UI_ActionComboBox));
+   etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox), 
etk_image_new_from_edje (EdjeFile,"DESC.PNG"), "State Set");
+   etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox), 
etk_image_new_from_edje (EdjeFile,"DESC.PNG"), "Action Stop");
+   etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox), 
etk_image_new_from_edje (EdjeFile,"DESC.PNG"), "Signal Emit");
+   etk_table_attach_default (ETK_TABLE(table),UI_ActionComboBox, 1, 3, 4, 4);
+
+   //UI_TransiComboBox
+   label = etk_label_new("<b>Transition</b>");
+   etk_table_attach(ETK_TABLE(table), label, 0, 0, 5, 5,0,0,ETK_TABLE_NONE);
+   UI_TransiComboBox = etk_combobox_new();
+   etk_combobox_column_add(ETK_COMBOBOX(UI_TransiComboBox), 
ETK_COMBOBOX_IMAGE, 24, ETK_FALSE, ETK_TRUE, ETK_TRUE, 0.0, 0.5);
+   etk_combobox_column_add(ETK_COMBOBOX(UI_TransiComboBox), 
ETK_COMBOBOX_LABEL, 75, ETK_TRUE, ETK_FALSE, ETK_FALSE, 0.0, 0.5);
+   etk_combobox_build(ETK_COMBOBOX(UI_TransiComboBox));
+   etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox), 
etk_image_new_from_edje (EdjeFile,"DESC.PNG"), "Linear");
+   etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox), 
etk_image_new_from_edje (EdjeFile,"DESC.PNG"), "Sinusoidal");
+   etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox), 
etk_image_new_from_edje (EdjeFile,"DESC.PNG"), "Accelerate");
+   etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox), 
etk_image_new_from_edje (EdjeFile,"DESC.PNG"), "Decelerate");
+   etk_table_attach_default (ETK_TABLE(table),UI_TransiComboBox, 1, 1, 5, 5);
+
+   label = etk_label_new("<b>seconds</b>");
+   etk_table_attach(ETK_TABLE(table), label, 2, 2, 5, 5,0,0,ETK_TABLE_NONE);
+   //SecondsSpinner
+   UI_SecondsSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.1, 1.0);
+   etk_spinner_digits_set (ETK_SPINNER(UI_SecondsSpinner), 1);
+   etk_widget_size_request_set(UI_SecondsSpinner,45, 20);
+   etk_table_attach_default (ETK_TABLE(table),UI_SecondsSpinner, 3, 3, 5, 5);
+
+   //UI_AfterEntry
+   label = etk_label_new("<b>After</b>");
+   etk_table_attach (ETK_TABLE(table), label, 0, 0, 6, 6,0,0,ETK_TABLE_NONE);
+   UI_AfterEntry = etk_entry_new();
+   etk_table_attach_default (ETK_TABLE(table),UI_AfterEntry, 1, 3, 6, 6);
+
+   return UI_ProgramFrame;
+}
+
 void
 create_main_window(void)
 {
@@ -1694,6 +1773,10 @@
    //Position Frame
    etk_box_append(ETK_BOX(vbox), create_position_frame(), ETK_BOX_START, 
ETK_BOX_NONE, 0);
 
+   //Program Frame
+   etk_box_append(ETK_BOX(vbox), create_program_frame(), ETK_BOX_START, 
ETK_BOX_NONE, 0);
+
+
    //canvas
    ETK_canvas = etk_canvas_new ();
    etk_widget_padding_set(ETK_canvas,4,4,4,4);
@@ -1732,4 +1815,5 @@
    etk_widget_hide(UI_ImageFrame);
    etk_widget_hide(UI_TextFrame);
    etk_widget_hide(UI_GroupFrame);
+   etk_widget_hide(UI_ProgramFrame);
 }
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- interface.h 13 Jan 2007 23:14:46 -0000      1.6
+++ interface.h 19 Jan 2007 08:49:00 -0000      1.7
@@ -19,6 +19,7 @@
 Etk_Widget *UI_RectFrame;
 Etk_Widget *UI_ImageFrame;
 Etk_Widget *UI_TextFrame;
+Etk_Widget *UI_ProgramFrame;
 Etk_Widget *UI_TextEntry;
 Etk_Widget *UI_FontComboBox;
 Etk_Widget *UI_ImageComboBox;
@@ -28,10 +29,7 @@
 Etk_Widget *UI_GroupFrame;
 Etk_Widget *UI_PartNameEntry;
 Etk_Widget *UI_PartTypeComboBox;
-Etk_Widget *UI_ColorAlphaSlider;
-Etk_Widget *UI_AlphaLabel;
 Etk_Widget *UI_ImageAlphaSlider;
-Etk_Widget *UI_TextAlphaSlider;
 Etk_Widget *UI_Rel1XSpinner;
 Etk_Widget *UI_Rel1XOffsetSpinner;
 Etk_Widget *UI_Rel1YSpinner;
@@ -70,25 +68,16 @@
 Etk_Widget *UI_StateMinHSpinner;
 Etk_Widget *UI_StateMaxWSpinner;
 Etk_Widget *UI_StateMaxHSpinner;
-
+Etk_Widget *UI_ProgramEntry;
+Etk_Widget *UI_SignalEntry;
+Etk_Widget *UI_ActionComboBox;
+Etk_Widget *UI_TransiComboBox;
+Etk_Widget *UI_SecondsSpinner;
+Etk_Widget *UI_AfterEntry;
+Etk_Widget *UI_SourceEntry;
+Etk_Widget *UI_TargetEntry;
 
 void     create_main_window      (void);
-void     UpdatePartFrame         (void);
-void     UpdateRectFrame         (void);
-void     UpdateDescriptionFrame  (void);
-void     UpdatePositionFrame     (void);
-void     UpdateComboPositionFrame(void);
-void     UpdateImageFrame        (void);
-void     UpdateTextFrame         (void);
-void     UpdateWindowTitle       (void);
-
-
-
-
-void     ShowFilechooser         (int FileChooserType);
-void     ShowAlert               (char* text);
-
-
 void     PopulateTree            (void);
 void     AddGroupToTree          (Engrave_Group* group);
 void     AddPartToTree           (Engrave_Part* part);
@@ -97,3 +86,14 @@
 void     PopulateImagesComboBox        (void);
 void     PopulateFontsComboBox (void);
 void     UpdateGroupFrame        (void);
+void     UpdatePositionFrame     (void);
+void     UpdateComboPositionFrame(void);
+void     UpdateImageFrame        (void);
+void     UpdateTextFrame         (void);
+void     UpdatePartFrame         (void);
+void     UpdateRectFrame         (void);
+void     UpdateDescriptionFrame  (void);
+void     UpdateProgFrame         (void);
+void     UpdateWindowTitle       (void);
+void     ShowFilechooser         (int FileChooserType);
+void     ShowAlert               (char* text);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- main.h      13 Jan 2007 03:11:32 -0000      1.4
+++ main.h      19 Jan 2007 08:49:00 -0000      1.5
@@ -74,6 +74,7 @@
    ROW_GROUP,
    ROW_PART,
    ROW_DESC,
+   ROW_PROG,
    DRAG_MINIARROW,
    DRAG_REL1,
    DRAG_REL2,
@@ -85,6 +86,7 @@
    Engrave_File  *ef;
    Engrave_Group *eg;
    Engrave_Part  *ep;
+   Engrave_Program *epr;
    Engrave_Part_State *eps;
 }Cur;
 



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to