Menu
▾
▴
E CVS: proto davemds
|
From: Enlightenment C. <no...@cv...> - 2007-01-17 20:07:46
|
Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c callbacks.h interface.c main.c
Log Message:
* gtk_tree2 -> gtk_tree
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- callbacks.c 15 Jan 2007 02:59:48 -0000 1.9
+++ callbacks.c 18 Jan 2007 02:07:38 -0000 1.10
@@ -95,36 +95,6 @@
break;
case TOOLBAR_DEBUG:
DebugInfo(TRUE);
-
- Engrave_Part *part;
- Engrave_Part_State *new_state;
- Engrave_Group *group;
- group = engrave_group_new();
- engrave_group_name_set (group, "New group");
- engrave_file_group_add (Cur.ef, group);
-
- AddGroupToTree(group);
- Cur.eg = group;
-
-
- part = engrave_part_new(ENGRAVE_PART_TYPE_RECT);
- engrave_part_name_set (part, "new rectangle");
- engrave_group_part_add(Cur.eg, part);
- AddPartToTree(part);
-
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "default", 0.0);
- engrave_part_state_add(part,new_state);
- AddStateToTree(new_state);
-
- Cur.ep = part;
- Cur.eps = new_state;
-
- etk_tree2_row_select(ecore_hash_get(hash,Cur.eps));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.eg));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.ep));
-
- PopulateRelComboBoxes();
break;
case TOOLBAR_IMAGE_FILE_ADD:
ShowAlert("Not yet implemented =)");
@@ -143,7 +113,7 @@
/* Tree callbacks */
void
-on_PartsTree_row_selected(Etk_Object *object, Etk_Tree2_Row *row, void *data)
+on_PartsTree_row_selected(Etk_Object *object, Etk_Tree_Row *row, void *data)
{
int row_type=0;
Engrave_Group* old_group = Cur.eg;
@@ -151,15 +121,15 @@
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
- etk_tree2_row_fields_get(row,
- etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 2),&row_type,
+ etk_tree_row_fields_get(row,
+ etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 2),&row_type,
NULL);
switch (row_type)
{
case ROW_GROUP:
-
- Cur.eg = etk_tree2_row_data_get (row);
+ printf("ROW_GROUP %d\n",Cur.eg);
+ Cur.eg = etk_tree_row_data_get (row);
Cur.ep = NULL;
Cur.eps = NULL;
etk_widget_hide(UI_DescriptionFrame);
@@ -171,7 +141,7 @@
etk_widget_show(UI_GroupFrame);
break;
case ROW_PART:
- Cur.ep = etk_tree2_row_data_get (row);
+ Cur.ep = etk_tree_row_data_get (row);
Cur.eg = Cur.ep->parent;
Cur.eps = NULL;
etk_widget_hide(UI_DescriptionFrame);
@@ -184,7 +154,7 @@
UpdatePartFrame();
break;
case ROW_DESC:
- Cur.eps = etk_tree2_row_data_get (row);
+ Cur.eps = etk_tree_row_data_get (row);
Cur.ep = Cur.eps->parent;
Cur.eg = Cur.ep->parent;
Cur.ep->current_state = Cur.eps;
@@ -250,7 +220,7 @@
void
on_GroupNameEntry_text_changed(Etk_Object *object, void *data)
{
- Etk_Tree2_Col *col1=NULL;
+ Etk_Tree_Col *col1=NULL;
printf("Text Changed Signal on PartNameEntry EMITTED (text: %s)\n",etk_entry_text_get(ETK_ENTRY(object)));
if (Cur.eg && ecore_hash_get(hash,Cur.eg))
@@ -258,8 +228,8 @@
engrave_group_name_set(Cur.eg,etk_entry_text_get(ETK_ENTRY(object)));
//Update PartsTree
- if ((col1 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 0)))
- etk_tree2_row_fields_set(ecore_hash_get(hash,Cur.eg),TRUE,
+ if ((col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0)))
+ etk_tree_row_fields_set(ecore_hash_get(hash,Cur.eg),TRUE,
col1,EdjeFile,"NONE.PNG",engrave_group_name_get(Cur.eg),
NULL);
@@ -306,7 +276,7 @@
void
on_PartNameEntry_text_changed(Etk_Object *object, void *data)
{
- Etk_Tree2_Col *col1=NULL;
+ Etk_Tree_Col *col1=NULL;
//printf("Text Changed Signal on PartNameEntry EMITTED (text: %s)\n",etk_entry_text_get(ETK_ENTRY(object)));
@@ -316,26 +286,26 @@
//RenamePart(Cur.ep,etk_entry_text_get(ETK_ENTRY(object)));
PopulateRelComboBoxes();
//Update PartTree
- col1 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 0);
+ col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0);
switch (Cur.ep->type)
{
case ENGRAVE_PART_TYPE_IMAGE:
- etk_tree2_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
+ etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
col1,EdjeFile,"IMAGE.PNG",etk_entry_text_get(ETK_ENTRY(object)),
NULL);
break;
case ENGRAVE_PART_TYPE_RECT:
- etk_tree2_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
+ etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
col1,EdjeFile,"RECT.PNG",etk_entry_text_get(ETK_ENTRY(object)),
NULL);
break;
case ENGRAVE_PART_TYPE_TEXT:
- etk_tree2_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
+ etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
col1,EdjeFile,"TEXT.PNG",etk_entry_text_get(ETK_ENTRY(object)),
NULL);
break;
default:
- etk_tree2_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
+ etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
col1,EdjeFile,"NONE.PNG",etk_entry_text_get(ETK_ENTRY(object)),
NULL);
break;
@@ -346,7 +316,7 @@
void
on_StateEntry_text_changed(Etk_Object *object, void *data)
{
- Etk_Tree2_Col *col1=NULL;
+ Etk_Tree_Col *col1=NULL;
char buf[4096];
char *nn; //new name
printf("Text Changed Signal on StateEntry EMITTED\n");
@@ -364,9 +334,9 @@
}
//Update PartTree
- col1 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 0);
+ col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0);
snprintf(buf,4095,"%s %.2f",Cur.eps->name,Cur.eps->value);
- etk_tree2_row_fields_set(ecore_hash_get(hash,Cur.eps),TRUE,
+ etk_tree_row_fields_set(ecore_hash_get(hash,Cur.eps),TRUE,
col1,EdjeFile,"DESC.PNG",buf,NULL);
}
}
@@ -375,7 +345,7 @@
on_StateIndexSpinner_value_changed(Etk_Range *range, double value, void *data)
{
char buf[4096];
- Etk_Tree2_Col *col1=NULL;
+ Etk_Tree_Col *col1=NULL;
printf("Value Changed Signal on StateIndexSpinner EMITTED\n");
if (Cur.eps)
@@ -391,9 +361,9 @@
}
//Update PartTree
//Update PartTree
- col1 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 0);
+ col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0);
snprintf(buf,4095,"%s %.2f",Cur.eps->name,Cur.eps->value);
- etk_tree2_row_fields_set(ecore_hash_get(hash,Cur.eps),TRUE,
+ etk_tree_row_fields_set(ecore_hash_get(hash,Cur.eps),TRUE,
col1,EdjeFile,"DESC.PNG",buf,NULL);
}
}
@@ -767,7 +737,7 @@
printf("Item Activated Signal on AddMenu EMITTED\n");
- if (!Cur.eg && ((int)data != NEW_DESC) && ((int)data != NEW_GROUP))
+ /* if (!Cur.eg && ((int)data != NEW_DESC) && ((int)data != NEW_GROUP))
{
group = engrave_group_new();
engrave_group_name_set (group, "New group");
@@ -775,68 +745,87 @@
AddGroupToTree(group);
Cur.eg = group;
- }
+ }*/
switch ((int)data)
{
case NEW_RECT:
- part = engrave_part_new(ENGRAVE_PART_TYPE_RECT);
- engrave_part_name_set (part, "new rectangle");
- engrave_group_part_add(Cur.eg, part);
- AddPartToTree(part);
-
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "default", 0.0);
- engrave_part_state_add(part,new_state);
- AddStateToTree(new_state);
-
- Cur.ep = part;
- Cur.eps = new_state;
-
- etk_tree2_row_select(ecore_hash_get(hash,Cur.eps));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.eg));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.ep));
+ if (Cur.eg){
+ part = engrave_part_new(ENGRAVE_PART_TYPE_RECT);
+ engrave_part_name_set (part, "new rectangle");
+ engrave_group_part_add(Cur.eg, part);
+ AddPartToTree(part);
+
+ new_state = engrave_part_state_new();
+ engrave_part_state_name_set(new_state, "default", 0.0);
+ engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
+ engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
+ engrave_part_state_add(part,new_state);
+ AddStateToTree(new_state);
+
+ Cur.ep = part;
+ //Cur.eps = new_state;
+
+ etk_tree_row_select(ecore_hash_get(hash,new_state));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
- PopulateRelComboBoxes();
+ PopulateRelComboBoxes();
+ }else{
+ ShowAlert("You must first select a group.");
+ }
break;
case NEW_IMAGE:
- part = engrave_part_new(ENGRAVE_PART_TYPE_IMAGE);
- engrave_part_name_set (part, "new image");
- engrave_group_part_add(Cur.eg, part);
- AddPartToTree(part);
-
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "default", 0.0);
- engrave_part_state_add(part,new_state);
- AddStateToTree(new_state);
-
- Cur.ep = part;
- Cur.eps = new_state;
-
- etk_tree2_row_select(ecore_hash_get(hash,Cur.eps));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.eg));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.ep));
+ if (Cur.eg){
+ part = engrave_part_new(ENGRAVE_PART_TYPE_IMAGE);
+ engrave_part_name_set (part, "new image");
+ engrave_group_part_add(Cur.eg, part);
+ AddPartToTree(part);
- PopulateRelComboBoxes();
+ new_state = engrave_part_state_new();
+ engrave_part_state_name_set(new_state, "default", 0.0);
+ engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
+ engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
+ engrave_part_state_add(part,new_state);
+ AddStateToTree(new_state);
+
+ Cur.ep = part;
+ //Cur.eps = new_state;
+
+ etk_tree_row_select(ecore_hash_get(hash,new_state));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
+
+ PopulateRelComboBoxes();
+ }else{
+ ShowAlert("You must first select a group.");
+ }
break;
case NEW_TEXT:
- part = engrave_part_new(ENGRAVE_PART_TYPE_TEXT);
- engrave_part_name_set (part, "new text");
- engrave_group_part_add(Cur.eg, part);
- AddPartToTree(part);
-
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "default", 0.0);
- engrave_part_state_add(part,new_state);
- AddStateToTree(new_state);
-
- Cur.ep = part;
- Cur.eps = new_state;
-
- etk_tree2_row_select(ecore_hash_get(hash,Cur.eps));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.eg));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.ep));
+ if (Cur.eg){
+ part = engrave_part_new(ENGRAVE_PART_TYPE_TEXT);
+ engrave_part_name_set (part, "new text");
+ engrave_group_part_add(Cur.eg, part);
+ AddPartToTree(part);
+
+ new_state = engrave_part_state_new();
+ engrave_part_state_name_set(new_state, "default", 0.0);
+ engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
+ engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
+ engrave_part_state_add(part,new_state);
+ AddStateToTree(new_state);
+
+ Cur.ep = part;
+ //Cur.eps = new_state;
+
+ etk_tree_row_select(ecore_hash_get(hash,new_state));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
+
+ PopulateRelComboBoxes();
+ }else{
+ ShowAlert("You must first select a group.");
+ }
- PopulateRelComboBoxes();
break;
case NEW_DESC:
if (Cur.ep){
@@ -845,10 +834,11 @@
engrave_part_state_add(Cur.ep,new_state);
AddStateToTree(new_state);
- Cur.eps = new_state;
- etk_tree2_row_select(ecore_hash_get(hash,Cur.eps));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.ep));
- etk_tree2_row_unfold(ecore_hash_get(hash,Cur.eg));
+ //Cur.eps = new_state;
+
+ etk_tree_row_select(ecore_hash_get(hash,new_state));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
+ etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
}else{
ShowAlert("You must first select a part.");
@@ -861,33 +851,31 @@
AddGroupToTree(group);
- Cur.eg = group;
- Cur.ep = NULL;
- Cur.eps = NULL;
- etk_tree2_row_select(ecore_hash_get(hash,group));
+ etk_tree_row_select(ecore_hash_get(hash,group));
break;
}
+ ev_redraw();
}
void
on_RemoveMenu_item_activated(Etk_Object *object, void *data)
{
- Etk_Tree2_Row* row;
+ Etk_Tree_Row* row;
printf("Item Activated Signal on RemoveMenu EMITTED\n");
switch ((int)data){
case REMOVE_DESCRIPTION:
if (Cur.eps){
if (strcmp(engrave_part_state_name_get(Cur.eps,NULL),"default") || Cur.eps->value != 0){
printf("REMOVE DESCRIPTION: %s\n",Cur.eps->name);
- row = etk_tree2_row_prev_get(ecore_hash_get(hash,Cur.eps));
-
- etk_tree2_row_delete(ecore_hash_get(hash,Cur.eps));
+ row = etk_tree_row_next_get(ecore_hash_get(hash,Cur.eps));
+ if (!row) row = etk_tree_row_prev_get(ecore_hash_get(hash,Cur.eps));
+ etk_tree_row_delete(ecore_hash_get(hash,Cur.eps));
ecore_hash_remove (hash, Cur.eps);
PROTO_engrave_part_state_remove(Cur.ep, Cur.eps);
engrave_part_state_free(Cur.eps);
Cur.eps = NULL;
- etk_tree2_row_select (row);
+ if (row) etk_tree_row_select (row);
ev_redraw();
}else{
@@ -901,9 +889,9 @@
if (Cur.ep){
printf("REMOVE PART: %s\n",Cur.ep->name);
row = NULL;
- row = etk_tree2_row_next_get(ecore_hash_get(hash,Cur.ep));
-
- etk_tree2_row_delete(ecore_hash_get(hash,Cur.ep));
+ row = etk_tree_row_next_get(ecore_hash_get(hash,Cur.ep));
+ if (!row) row = etk_tree_row_prev_get(ecore_hash_get(hash,Cur.ep));
+ etk_tree_row_delete(ecore_hash_get(hash,Cur.ep));
ecore_hash_remove (hash, Cur.ep);
PROTO_engrave_group_part_remove(Cur.eg,Cur.ep);
engrave_part_free(Cur.ep);
@@ -911,8 +899,8 @@
Cur.ep = NULL;
Cur.eps = NULL;
- if (row) etk_tree2_row_select(row);
- else etk_tree2_row_select(etk_tree2_row_last_child_get (etk_tree2_last_row_get (ETK_TREE2(UI_PartsTree))));
+ if (row) etk_tree_row_select(row);
+ else etk_tree_row_select(etk_tree_row_last_child_get (etk_tree_last_row_get (ETK_TREE(UI_PartsTree))));
ev_redraw();
}else{
@@ -923,9 +911,10 @@
if (Cur.eg)
{
row = NULL;
- row = etk_tree2_row_prev_get(ecore_hash_get(hash,Cur.eg));
+ row = etk_tree_row_next_get(ecore_hash_get(hash,Cur.eg));
+ if (!row) row = etk_tree_row_prev_get(ecore_hash_get(hash,Cur.eg));
- etk_tree2_row_delete(ecore_hash_get(hash,Cur.eg));
+ etk_tree_row_delete(ecore_hash_get(hash,Cur.eg));
ecore_hash_remove (hash, Cur.eg);
PROTO_engrave_file_group_remove(Cur.ef,Cur.eg);
engrave_group_free(Cur.eg);
@@ -935,7 +924,7 @@
Cur.eps = NULL;
ev_redraw();
- etk_tree2_row_select(row);
+ if (row) etk_tree_row_select(row);
}else{
ShowAlert("No group selected");
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- callbacks.h 13 Jan 2007 23:14:46 -0000 1.6
+++ callbacks.h 18 Jan 2007 02:07:38 -0000 1.7
@@ -6,7 +6,7 @@
//void on_GroupComboBox_changed (Etk_Combobox *combobox, void *data);
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_Tree2_Row *row, 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);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- interface.c 15 Jan 2007 02:59:48 -0000 1.11
+++ interface.c 18 Jan 2007 02:07:38 -0000 1.12
@@ -14,33 +14,32 @@
void
AddGroupToTree(Engrave_Group* group)
{
- Etk_Tree2_Col *col1,*col2,*col3;
- Etk_Tree2_Row *row=NULL;
+ Etk_Tree_Col *col1,*col2,*col3;
+ Etk_Tree_Row *row=NULL;
- col1 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 0);
- col2 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 1);
- col3 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 2);
- //printf("ADD\n");
- row = etk_tree2_row_append(ETK_TREE2(UI_PartsTree), NULL,
+ 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), NULL,
col1, EdjeFile,"NONE.PNG", group->name,
col3,ROW_GROUP, NULL);
ecore_hash_set (hash, group, row);
- etk_tree2_row_data_set(row,group);
-
+ etk_tree_row_data_set(row,group);
}
void
AddPartToTree(Engrave_Part* part)
{
- Etk_Tree2_Col *col1,*col2,*col3;
- Etk_Tree2_Row *row=NULL;
+ Etk_Tree_Col *col1,*col2,*col3;
+ Etk_Tree_Row *row=NULL;
char buf[20];
//printf("Add Part to tree: %s\n",par->name);
- col1 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 0);
- col2 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 1);
- col3 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 2);
+ 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);
switch (part->type){
case ENGRAVE_PART_TYPE_IMAGE:
@@ -57,38 +56,38 @@
break;
}
- row = etk_tree2_row_append(ETK_TREE2(UI_PartsTree),
+ row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
ecore_hash_get(hash,part->parent),
col1, EdjeFile,buf, part->name,
col3,ROW_PART,
NULL);
ecore_hash_set(hash, part, row);
- etk_tree2_row_data_set(row, part);
+ etk_tree_row_data_set(row, part);
}
void
AddStateToTree(Engrave_Part_State* state)
{
- Etk_Tree2_Col *col1,*col2,*col3;
- Etk_Tree2_Row *row;
+ Etk_Tree_Col *col1,*col2,*col3;
+ Etk_Tree_Row *row;
Etk_String *str = etk_string_new("");
char buf[4096];
const char *stock_key;
- col1 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 0);
- col2 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 1);
- col3 = etk_tree2_nth_col_get(ETK_TREE2(UI_PartsTree), 2);
+ 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);
snprintf(buf,4096,"%s %.2f",state->name,state->value);
stock_key = etk_stock_key_get(ETK_STOCK_TEXT_X_GENERIC, ETK_STOCK_SMALL);
- row = etk_tree2_row_append(ETK_TREE2(UI_PartsTree),
+ row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
//part->user_data,
ecore_hash_get(hash,state->parent),
col1,EdjeFile,"DESC.PNG",buf,
col2,TRUE,
col3,ROW_DESC, NULL);
- etk_tree2_row_data_set (row, state);
+ etk_tree_row_data_set (row, state);
ecore_hash_set(hash, state, row);
@@ -1002,29 +1001,29 @@
Etk_Widget*
create_tree_frame(void)
{
- Etk_Tree2_Col *col;
+ Etk_Tree_Col *col;
//UI_PartsTree
- UI_PartsTree = etk_tree2_new();
+ UI_PartsTree = etk_tree_new();
etk_widget_padding_set(UI_PartsTree,2,2,2,2);
- etk_tree2_mode_set (ETK_TREE2(UI_PartsTree), ETK_TREE2_MODE_TREE);
+ etk_tree_mode_set (ETK_TREE(UI_PartsTree), ETK_TREE_MODE_TREE);
etk_widget_size_request_set(UI_PartsTree, 260, 300);
- col = etk_tree2_col_new(ETK_TREE2(UI_PartsTree), "File contents",100,0);
- etk_tree2_col_model_add(col,etk_tree2_model_image_new());
- etk_tree2_col_model_add(col,etk_tree2_model_text_new());
- etk_tree2_col_resizable_set (col, FALSE);
- etk_tree2_col_expand_set (col,TRUE);
- col = etk_tree2_col_new(ETK_TREE2(UI_PartsTree), "vis", 10,0);
- etk_tree2_col_visible_set (col, FALSE);
- etk_tree2_col_model_add(col,etk_tree2_model_checkbox_new());
- etk_tree2_col_resizable_set (col, FALSE);
- etk_tree2_col_expand_set (col,FALSE);
- col = etk_tree2_col_new(ETK_TREE2(UI_PartsTree), "type",10, 0);
- etk_tree2_col_model_add(col,etk_tree2_model_int_new());
- etk_tree2_col_visible_set (col, FALSE);
- etk_tree2_col_resizable_set (col, FALSE);
- etk_tree2_col_expand_set (col,FALSE);
- etk_tree2_build(ETK_TREE2(UI_PartsTree));
+ col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "File contents",100,0);
+ etk_tree_col_model_add(col,etk_tree_model_image_new());
+ etk_tree_col_model_add(col,etk_tree_model_text_new());
+ etk_tree_col_resizable_set (col, FALSE);
+ etk_tree_col_expand_set (col,TRUE);
+ col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "vis", 10,0);
+ etk_tree_col_visible_set (col, FALSE);
+ etk_tree_col_model_add(col,etk_tree_model_checkbox_new());
+ etk_tree_col_resizable_set (col, FALSE);
+ etk_tree_col_expand_set (col,FALSE);
+ col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "type",10, 0);
+ etk_tree_col_model_add(col,etk_tree_model_int_new());
+ etk_tree_col_visible_set (col, FALSE);
+ etk_tree_col_resizable_set (col, FALSE);
+ etk_tree_col_expand_set (col,FALSE);
+ etk_tree_build(ETK_TREE(UI_PartsTree));
etk_signal_connect("row_selected", ETK_OBJECT(UI_PartsTree), ETK_CALLBACK(on_PartsTree_row_selected), NULL);
@@ -1075,7 +1074,7 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_AspectMinSpinner
- UI_AspectMinSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.1, 1.0);
+ UI_AspectMinSpinner = etk_spinner_new (0.0, 100.0, 0.0, 0.1, 1.0);
etk_spinner_digits_set (ETK_SPINNER(UI_AspectMinSpinner), 1);
etk_widget_size_request_set(UI_AspectMinSpinner,45, 20);
etk_box_append(ETK_BOX(hbox),UI_AspectMinSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -1085,7 +1084,7 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_AspectMaxSpinner
- UI_AspectMaxSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.1, 1.0);
+ UI_AspectMaxSpinner = etk_spinner_new (0.0, 100.0, 0.0, 0.1, 1.0);
etk_spinner_digits_set (ETK_SPINNER(UI_AspectMaxSpinner), 1);
etk_widget_size_request_set(UI_AspectMaxSpinner,45, 20);
etk_box_append(ETK_BOX(hbox),UI_AspectMaxSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- main.c 13 Jan 2007 03:11:32 -0000 1.6
+++ main.c 18 Jan 2007 02:07:38 -0000 1.7
@@ -102,6 +102,8 @@
}
}
+ if (ep->object) evas_object_del(ep->object);
+
eg->parts = evas_list_remove(eg->parts,ep);
engrave_part_parent_set(ep, NULL);
}
|