Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c main.c main.h
Log Message:
The test version is now stable and you can manage well all the positions
params (relative, offset, to).
To try it use edje_patch_3 on bug #294 and change main.h(16) to 1
:) you can open perfectly all the edje files.
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- callbacks.c 2 Dec 2007 16:44:14 -0000 1.38
+++ callbacks.c 3 Dec 2007 00:45:15 -0000 1.39
@@ -44,6 +44,29 @@
//ShowAlert("Not yet implemented");
ShowFilechooser(FILECHOOSER_OPEN);
break;
+#if TEST_DIRECT_EDJE
+ case TOOLBAR_SAVE:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_SAVE_EDC:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_SAVE_EDJ:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_ADD:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_REMOVE:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_MOVE_UP: //Lower
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_MOVE_DOWN: //Raise
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+#else
case TOOLBAR_SAVE:
if (Cur.open_file_name)
SaveEDJ(Cur.open_file_name);
@@ -130,6 +153,7 @@
else
ShowAlert("You must choose a part to raise");
break;
+#endif
case TOOLBAR_OPTIONS:
etk_menu_popup(ETK_MENU(UI_OptionsMenu));
//etk_menu_popup_at_xy (ETK_MENU(AddMenu), 10, 10);
@@ -306,6 +330,7 @@
edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string);
UpdatePositionFrame();
+ UpdateComboPositionFrame();
edje_object_signal_emit(edje_ui,"part_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"group_frame_hide","edje_editor");
@@ -690,6 +715,35 @@
Etk_Bool
on_RelToComboBox_changed(Etk_Combobox *combobox, void *data)
{
+#if TEST_DIRECT_EDJE
+ char *part;
+ part = etk_combobox_item_data_get (etk_combobox_active_item_get (combobox));
+
+ if (part && (strcmp(part,Cur.part->string) == 0))
+ {
+ ShowAlert("A state can't rel to itself.");
+ return ETK_TRUE;
+ }
+ switch ((int)data)
+ {
+ case REL1X_SPINNER:
+ edje_edit_state_rel1_to_x_set(edje_o, Cur.part->string,
Cur.state->string, part);
+ break;
+ case REL1Y_SPINNER:
+ edje_edit_state_rel1_to_y_set(edje_o, Cur.part->string,
Cur.state->string, part);
+ break;
+ case REL2X_SPINNER:
+ edje_edit_state_rel2_to_x_set(edje_o, Cur.part->string,
Cur.state->string, part);
+ break;
+ case REL2Y_SPINNER:
+ edje_edit_state_rel2_to_y_set(edje_o, Cur.part->string,
Cur.state->string, part);
+ break;
+ }
+
+ edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string); //this make edje redraw (need to update in lib)
+ ev_redraw();
+ return ETK_TRUE;
+#else
printf("RelTocomboBox changed signal EMITTED \n");
Engrave_Part* part = NULL;
@@ -733,6 +787,7 @@
ev_redraw();
return ETK_TRUE;
+#endif
}
Etk_Bool
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas.c 2 Dec 2007 16:44:14 -0000 1.19
+++ evas.c 3 Dec 2007 00:45:15 -0000 1.20
@@ -196,7 +196,7 @@
#if TEST_DIRECT_EDJE
int o1x, o1y, o2x, o2y;
- char *state;
+ const char *state;
state = edje_edit_part_selected_state_get(edje_o, Cur.part->string);
o1x = edje_edit_state_rel1_offset_x_get(edje_o, Cur.part->string, state);
@@ -213,8 +213,7 @@
edje_object_part_geometry_get(edje_o, Cur.part->string, &px, &py, &pw,
&ph);
-
- printf("CURRENT STATE: %s - %d\n",state,o1x);
+ //printf("CURRENT STATE: %s - %d\n",state,o1x);
evas_object_move(focus_handler,
px + wx - o1x - 2, //- Cur.ep->current_state->rel1.offset.x - 2,
@@ -226,21 +225,21 @@
evas_object_raise (focus_handler);
evas_object_show(focus_handler);
}else
- {
evas_object_hide(focus_handler);
- }
+
// if a part description is selected draw also the parent handlers (the red
and blue lines)
- //if(Cur.eps && EV_fakewin && 0)
if (etk_string_length_get(Cur.state) && etk_string_length_get(Cur.part))
{
int px,py,pw,ph;
- printf("Draw parent Handlers\n");
+ int rx,ry,rw,rh;
+ const char *rel;
+ //printf("Draw parent Handlers\n");
//Get the geometry of fakewin
evas_object_geometry_get(EV_fakewin,&fx,&fy,&fw,&fh);
edje_object_part_geometry_get(edje_o, Cur.part->string, &px, &py, &pw,
&ph);
- printf("FW geom: %d %d %d %d\n",fx,fy,fw,fh);
- printf("PA geom: %d %d %d %d\n",px,py,pw,ph);
+ // printf("FW geom: %d %d %d %d\n",fx,fy,fw,fh);
+ // printf("PA geom: %d %d %d %d\n",px,py,pw,ph);
//Draw rel1 & rel2 point
evas_object_move (rel1_handler,
@@ -254,78 +253,57 @@
fy + py + ph - o2y - 4);
evas_object_show(rel2_handler);
evas_object_raise(rel2_handler);
-
- ParentX = fx;
- ParentY = fy;
- ParentW = fw;
- ParentH = fh;
//draw Rel1X_ParentH (top line)
- //~ if (engrave_part_state_rel1_to_x_get(Cur.eps)){
- //~ relto_part = engrave_group_part_by_name_find(Cur.eg,
- //~ engrave_part_state_rel1_to_x_get(Cur.eps));
- //~ if (relto_part->current_state)
- //~ {
- //~ ParentX = fx + relto_part->pos.x;
- //~ ParentY = fy + relto_part->pos.y;
- //~ ParentW = relto_part->pos.w;
- //~ ParentH = relto_part->pos.h;
- //~ }
- //~ }else{//Get FakeWin Geom
- //~ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY,
&ParentW, &ParentH);
- //~ }
-
+ if((rel = edje_edit_state_rel1_to_x_get(edje_o, Cur.part->string,
Cur.state->string)))
+ {
+ edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ ParentX = fx + rx;
+ ParentY = fy + ry;
+ ParentW = rw;
+ ParentH = rh;
+ }else//Get FakeWin Geom
+ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW,
&ParentH);
+
evas_object_line_xy_set (rel1X_parent_handler, ParentX, ParentY,
ParentX+ParentW, ParentY);
- //~ //draw Rel1Y_ParentH (left line)
- //~ if (engrave_part_state_rel1_to_y_get(Cur.eps)){
- //~ relto_part = engrave_group_part_by_name_find(Cur.eg,
- //~ engrave_part_state_rel1_to_y_get(Cur.eps));
- //~ if (relto_part->current_state)
- //~ {
- //~ ParentX = fx + relto_part->pos.x;
- //~ ParentY = fy + relto_part->pos.y;
- //~ ParentW = relto_part->pos.w;
- //~ ParentH = relto_part->pos.h;
- //~ }
- //~ }else{//Get FakeWin Geom
- //~ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY,
&ParentW, &ParentH);
- //~ }
+ //draw Rel1Y_ParentH (left line)
+ if((rel = edje_edit_state_rel1_to_y_get(edje_o, Cur.part->string,
Cur.state->string)))
+ {
+ edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ ParentX = fx + rx;
+ ParentY = fy + ry;
+ ParentW = rw;
+ ParentH = rh;
+ }else//Get FakeWin Geom
+ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW,
&ParentH);
+
evas_object_line_xy_set (rel1Y_parent_handler, ParentX, ParentY,
ParentX, ParentY+ParentH);
- //~ //draw Rel2X_ParentH (bottom line)
- //~ if (engrave_part_state_rel2_to_x_get(Cur.eps)){
- //~ relto_part = engrave_group_part_by_name_find(Cur.eg,
- //~ engrave_part_state_rel2_to_x_get(Cur.eps));
- //~ if (relto_part->current_state)
- //~ {
- //~ ParentX = fx + relto_part->pos.x;
- //~ ParentY = fy + relto_part->pos.y;
- //~ ParentW = relto_part->pos.w;
- //~ ParentH = relto_part->pos.h;
- //~ }
- //~ }else{//Get FakeWin Geom
- //~ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY,
&ParentW, &ParentH);
- //~ }
- //~ //evas_object_move (rel2X_parent_handler, ParentX,ParentY+ParentH-1);
- //~ //evas_object_resize(rel2X_parent_handler,ParentW,2);
+ //draw Rel2X_ParentH (bottom line)
+ if((rel = edje_edit_state_rel2_to_x_get(edje_o, Cur.part->string,
Cur.state->string)))
+ {
+ edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ ParentX = fx + rx;
+ ParentY = fy + ry;
+ ParentW = rw;
+ ParentH = rh;
+ }else//Get FakeWin Geom
+ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW,
&ParentH);
+
evas_object_line_xy_set (rel2X_parent_handler, ParentX, ParentY+ParentH,
ParentX+ParentW, ParentY+ParentH);
- //~ //draw Rel2Y_ParentH (right line)
- //~ if (engrave_part_state_rel2_to_y_get(Cur.eps)){
- //~ relto_part = engrave_group_part_by_name_find(Cur.eg,
- //~ engrave_part_state_rel2_to_y_get(Cur.eps));
- //~ if (relto_part->current_state)
- //~ {
- //~ ParentX = fx + relto_part->pos.x;
- //~ ParentY = fy + relto_part->pos.y;
- //~ ParentW = relto_part->pos.w;
- //~ ParentH = relto_part->pos.h;
- //~ }
- //~ }else{//Get FakeWin Geom
- //~ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY,
&ParentW, &ParentH);
- //~ }
+ //draw Rel2Y_ParentH (right line)
+ if((rel = edje_edit_state_rel2_to_y_get(edje_o, Cur.part->string,
Cur.state->string))){
+ edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ ParentX = fx + rx;
+ ParentY = fy + ry;
+ ParentW = rw;
+ ParentH = rh;
+ }else//Get FakeWin Geom
+ evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW,
&ParentH);
+
evas_object_line_xy_set (rel2Y_parent_handler, ParentX+ParentW, ParentY,
ParentX+ParentW, ParentY+ParentH);
evas_object_raise(rel1X_parent_handler);
@@ -340,9 +318,7 @@
evas_object_raise(rel1_handler);
evas_object_raise(rel2_handler);
-
-
- }else{
+ }else{ //none selected, hide all
edje_object_signal_emit(rel1_handler,"REL1_HIDE","edje_editor");
edje_object_signal_emit(focus_handler,"REL2_HIDE","edje_editor");
evas_object_hide(rel1X_parent_handler);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- interface.c 2 Dec 2007 16:44:14 -0000 1.45
+++ interface.c 3 Dec 2007 00:45:15 -0000 1.46
@@ -347,7 +347,7 @@
Etk_Combobox_Item *ComboItem;
Engrave_Part* part = NULL;
char buf[20];
-
+ printf("Populate 4 Rel Comboboxs\n");
//Stop signal propagation
etk_signal_disconnect("active-item-changed",
ETK_OBJECT(UI_Rel1ToXComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1X_SPINNER);
etk_signal_disconnect("active-item-changed",
ETK_OBJECT(UI_Rel1ToYComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1Y_SPINNER);
@@ -359,7 +359,68 @@
etk_combobox_clear(ETK_COMBOBOX(UI_Rel1ToYComboBox));
etk_combobox_clear(ETK_COMBOBOX(UI_Rel2ToXComboBox));
etk_combobox_clear(ETK_COMBOBOX(UI_Rel2ToYComboBox));
-
+#if TEST_DIRECT_EDJE
+ if (etk_string_length_get(Cur.group))
+ {
+ // Add first element 'Interface' to all the 4 combobox
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox),
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"),
"Interface");
+ etk_combobox_item_data_set (ComboItem, NULL);
+
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToYComboBox),
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"),
"Interface");
+ etk_combobox_item_data_set (ComboItem, NULL);
+
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToXComboBox),
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"),
"Interface");
+ etk_combobox_item_data_set (ComboItem, NULL);
+
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToYComboBox),
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"),
"Interface");
+ etk_combobox_item_data_set (ComboItem, NULL);
+ // Add all the part to all the 4 combobox
+ Evas_List *parts;
+ int type;
+
+ parts = edje_edit_parts_list_get(edje_o);
+ while (parts)
+ {
+ printf("-- %s\n", (char *)parts->data);
+ type = edje_edit_part_type_get(edje_o,(char *)parts->data);
+
+ if (type == EDJE_PART_TYPE_RECTANGLE)
+ snprintf(buf, 19,"RECT.PNG");
+ else if (type == EDJE_PART_TYPE_TEXT)
+ snprintf(buf, 19,"TEXT.PNG");
+ else if (type == EDJE_PART_TYPE_IMAGE)
+ snprintf(buf, 19,"IMAGE.PNG");
+ else snprintf(buf, 19,"NONE.PNG");
+
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox),
+ etk_image_new_from_edje (EdjeFile,buf),
+ (char *)parts->data);
+ etk_combobox_item_data_set (ComboItem, parts->data);
+
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToYComboBox),
+ etk_image_new_from_edje (EdjeFile,buf),
+ (char *)parts->data);
+ etk_combobox_item_data_set (ComboItem, parts->data);
+
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToXComboBox),
+ etk_image_new_from_edje (EdjeFile,buf),
+ (char *)parts->data);
+ etk_combobox_item_data_set (ComboItem, parts->data);
+
+ ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToYComboBox),
+ etk_image_new_from_edje (EdjeFile,buf),
+ (char *)parts->data);
+ etk_combobox_item_data_set (ComboItem, parts->data);
+
+ parts = parts->next;
+ }
+ //TODO: Free parts
+ }
+#else
if (Cur.eg)
{
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox),
etk_image_new_from_edje (EdjeFile,"NONE.PNG"),"Interface");
@@ -390,6 +451,7 @@
etk_combobox_item_data_set (ComboItem, part);
}
}
+#endif
//Reenable signal propagation
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1X_SPINNER);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1Y_SPINNER);
@@ -825,7 +887,9 @@
int i=0;
Etk_Combobox_Item *item = NULL;
Engrave_Part *part = NULL;
-
+
+ printf("SETTING COMBOS\n");
+
//Stop signal propagation
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL1X_SPINNER);
@@ -835,8 +899,92 @@
ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2X_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2Y_SPINNER);
-
- printf("SETTING COMBOS %s\n", Cur.eps->rel1.to_x);
+#if TEST_DIRECT_EDJE
+ if (!etk_string_length_get(Cur.part)) return;
+ if (!etk_string_length_get(Cur.state)) return;
+ char *rel;
+ char *p;
+ //If rel1_to_x is know set the combobox
+ if (rel = edje_edit_state_rel1_to_x_get(edje_o, Cur.part->string,
Cur.state->string))
+ {
+ printf("REL: %s\n",rel);
+ i=0;
+ while ((item =
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToXComboBox),i)))
+ {
+ //Loop for all the item in the Combobox
+ if ((p = etk_combobox_item_data_get(item)))
+ {
+ //Get the data for the item (should be the name of the part)
+ if ((int)p != REL_COMBO_INTERFACE)
+ if (strcmp(p,rel) == 0)
+ //If we found the item set active
+ etk_combobox_active_item_set
(ETK_COMBOBOX(UI_Rel1ToXComboBox),item);
+ }
+ i++;
+ }
+ }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToXComboBox),
+ etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToXComboBox),0));}
+
+ //If rel1_to_y is know set the combobox
+ if (rel = edje_edit_state_rel1_to_y_get(edje_o, Cur.part->string,
Cur.state->string))
+ {
+ i=0;
+ while ((item =
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToYComboBox),i)))
+ {
+ //Loop for all the item in the Combobox
+ if ((p = etk_combobox_item_data_get(item)))
+ {
+ //Get the data for the item (should be the name of the part)
+ if ((int)p != REL_COMBO_INTERFACE)
+ if (strcmp(p,rel) == 0)
+ //If we found the item set active
+ etk_combobox_active_item_set
(ETK_COMBOBOX(UI_Rel1ToYComboBox),item);
+ }
+ i++;
+ }
+ }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToYComboBox),
+ etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToYComboBox),0));}
+
+ //If rel2_to_x is know set the combobox
+ if (rel = edje_edit_state_rel2_to_x_get(edje_o, Cur.part->string,
Cur.state->string))
+ {
+ i=0;
+ while ((item =
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToXComboBox),i)))
+ {
+ //Loop for all the item in the Combobox
+ if ((p = etk_combobox_item_data_get(item)))
+ {
+ //Get the data for the item (should be the name of the part)
+ if ((int)p != REL_COMBO_INTERFACE)
+ if (strcmp(p,rel) == 0)
+ //If we found the item set active
+ etk_combobox_active_item_set
(ETK_COMBOBOX(UI_Rel2ToXComboBox),item);
+ }
+ i++;
+ }
+ }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToXComboBox),
+ etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToXComboBox),0));}
+
+ //If rel2_to_y is know set the combobox
+ if (rel = edje_edit_state_rel2_to_y_get(edje_o, Cur.part->string,
Cur.state->string))
+ {
+ i=0;
+ while ((item =
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToYComboBox),i)))
+ {
+ //Loop for all the item in the Combobox
+ if ((p = etk_combobox_item_data_get(item)))
+ {
+ //Get the data for the item (should be the name of the part)
+ if ((int)p != REL_COMBO_INTERFACE)
+ if (strcmp(p,rel) == 0)
+ //If we found the item set active
+ etk_combobox_active_item_set
(ETK_COMBOBOX(UI_Rel2ToYComboBox),item);
+ }
+ i++;
+ }
+ }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToYComboBox),
+ etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToYComboBox),0));}
+#else
//If rel1_to_x is know set the combobox
if (Cur.eps->rel1.to_x)
{
@@ -916,7 +1064,7 @@
}
}else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToYComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToYComboBox),0));}
-
+#endif
//Reenable signal propagation
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL1X_SPINNER);
@@ -1434,13 +1582,6 @@
sep = etk_vseparator_new();
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), sep, ETK_BOX_START);
-
- //Test Button
- button = etk_tool_button_new_from_stock( ETK_STOCK_MEDIA_PLAYBACK_START);
- etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_PLAY);
- etk_object_properties_set(ETK_OBJECT(button),"label","Test group",NULL);
- etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
#if TEST_DIRECT_EDJE
//UI_GroupsComboBox
@@ -1454,7 +1595,14 @@
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_GroupsComboBox),
ETK_CALLBACK(on_GroupsComboBox_changed), NULL);
-#endif
+#else
+ //Test Button
+ button = etk_tool_button_new_from_stock( ETK_STOCK_MEDIA_PLAYBACK_START);
+ etk_signal_connect("clicked", ETK_OBJECT(button),
+ ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_PLAY);
+ etk_object_properties_set(ETK_OBJECT(button),"label","Test group",NULL);
+ etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
+#endif
return UI_Toolbar;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- main.c 2 Dec 2007 16:55:28 -0000 1.19
+++ main.c 3 Dec 2007 00:45:15 -0000 1.20
@@ -249,10 +249,14 @@
printf("\n\n ********************* D E B U G
***************************\n");
printf(" ** open file name: %s\n",Cur.edj_file_name->string);
printf(" ** edje_editor.edj: %s\n",EdjeFile);
+ if (etk_string_length_get(Cur.group))
+ printf(" ** Cur group: %s\n",Cur.group->string);
+ else
+ printf(" ** Cur group: (NULL)\n");
if (etk_string_length_get(Cur.part))
printf(" ** Cur part: %s\n",Cur.part->string);
else
- printf(" ** Cur group: (NULL)\n");
+ printf(" ** Cur part: (NULL)\n");
if (etk_string_length_get(Cur.state))
printf(" ** Cur state: %s\n",Cur.state->string);
else
@@ -399,10 +403,13 @@
Parts_Hash = NULL; //TODO FREE
+ Cur.group = etk_string_set(Cur.group, group);
Cur.part = etk_string_clear(Cur.part);
Cur.state = etk_string_clear(Cur.state);
+
PopulateTree2();
+ PopulateRelComboBoxes();
}
#endif
/* main */
@@ -503,7 +510,8 @@
Cur.edj_file_name = etk_string_new(file);
ecore_evas_title_set(UI_ecore_MainWin, Cur.edj_file_name->string);
-
+
+ Cur.group = etk_string_new("");
Cur.part = etk_string_new("");
Cur.state = etk_string_new("");
Parts_Hash = NULL;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- main.h 2 Dec 2007 16:44:14 -0000 1.16
+++ main.h 3 Dec 2007 00:45:15 -0000 1.17
@@ -115,6 +115,7 @@
char *source_dir; //Full path to sources
char *main_source_file; //Full path to the main edc file
#if TEST_DIRECT_EDJE
+ Etk_String *group;
Etk_String *part;
Etk_String *state;
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
