Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c
Log Message:
Note that this release need the patch I have posted to the list
(dave_engrave_patch01)
* can now change the image in a image_part
* can now change image border
* display correct part state (not only the default one)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- callbacks.c 13 Jan 2007 23:14:46 -0000 1.7
+++ callbacks.c 14 Jan 2007 10:06:40 -0000 1.8
@@ -95,6 +95,36 @@
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 =)");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas.c 13 Jan 2007 03:11:32 -0000 1.4
+++ evas.c 14 Jan 2007 10:06:41 -0000 1.5
@@ -340,12 +340,12 @@
if (Cur.ep && Cur.ep->current_state)
{
etk_canvas_object_move(ETK_CANVAS(ETK_canvas),focus_handler,
- Cur.ep->current_state->pos.x + MAIN_LEFT -
Cur.ep->current_state->rel1.offset.x - 1,
- Cur.ep->current_state->pos.y + MAIN_TOP -
Cur.ep->current_state->rel1.offset.y - 1);
+ Cur.ep->pos.x + MAIN_LEFT - Cur.ep->current_state->rel1.offset.x -
1,
+ Cur.ep->pos.y + MAIN_TOP - Cur.ep->current_state->rel1.offset.y -
1);
evas_object_resize(focus_handler,
- Cur.ep->current_state->pos.w +
Cur.ep->current_state->rel1.offset.x - Cur.ep->current_state->rel2.offset.x + 1,
- Cur.ep->current_state->pos.h +
Cur.ep->current_state->rel1.offset.y - Cur.ep->current_state->rel2.offset.y +
1);
+ Cur.ep->pos.w + Cur.ep->current_state->rel1.offset.x -
Cur.ep->current_state->rel2.offset.x + 1,
+ Cur.ep->pos.h + Cur.ep->current_state->rel1.offset.y -
Cur.ep->current_state->rel2.offset.y + 1);
evas_object_raise (focus_handler);
evas_object_show(focus_handler);
}else
@@ -365,15 +365,15 @@
//printf("pos.x: %d \n",Cur.eps->pos.w);
//Draw rel1 & rel2 point
evas_object_move (rel1_handler,
- fx + Cur.eps->pos.x - Cur.eps->rel1.offset.x - 2,
- fy + Cur.eps->pos.y - Cur.eps->rel1.offset.y - 2);
+ fx + Cur.ep->pos.x - Cur.eps->rel1.offset.x - 2,
+ fy + Cur.ep->pos.y - Cur.eps->rel1.offset.y - 2);
evas_object_show(rel1_handler);
evas_object_raise(rel1_handler);
evas_object_move (rel2_handler,
- fx + Cur.eps->pos.x + Cur.eps->pos.w - Cur.eps->rel2.offset.x - 2,
- fy + Cur.eps->pos.y + Cur.eps->pos.h - Cur.eps->rel2.offset.y - 2);
+ fx + Cur.ep->pos.x + Cur.ep->pos.w - Cur.eps->rel2.offset.x - 2,
+ fy + Cur.ep->pos.y + Cur.ep->pos.h - Cur.eps->rel2.offset.y - 2);
evas_object_show(rel2_handler);
evas_object_raise(rel2_handler);
@@ -384,10 +384,10 @@
engrave_part_state_rel1_to_x_get(Cur.eps));
if (relto_part->current_state)
{
- ParentX = fx + relto_part->current_state->pos.x;
- ParentY = fy + relto_part->current_state->pos.y;
- ParentW = relto_part->current_state->pos.w;
- ParentH = relto_part->current_state->pos.h;
+ 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);
@@ -401,10 +401,10 @@
engrave_part_state_rel1_to_y_get(Cur.eps));
if (relto_part->current_state)
{
- ParentX = fx + relto_part->current_state->pos.x;
- ParentY = fy + relto_part->current_state->pos.y;
- ParentW = relto_part->current_state->pos.w;
- ParentH = relto_part->current_state->pos.h;
+ 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);
@@ -418,10 +418,10 @@
engrave_part_state_rel2_to_x_get(Cur.eps));
if (relto_part->current_state)
{
- ParentX = fx + relto_part->current_state->pos.x;
- ParentY = fy + relto_part->current_state->pos.y;
- ParentW = relto_part->current_state->pos.w;
- ParentH = relto_part->current_state->pos.h;
+ 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);
@@ -435,10 +435,10 @@
engrave_part_state_rel2_to_y_get(Cur.eps));
if (relto_part->current_state)
{
- ParentX = fx + relto_part->current_state->pos.x;
- ParentY = fy + relto_part->current_state->pos.y;
- ParentW = relto_part->current_state->pos.w;
- ParentH = relto_part->current_state->pos.h;
+ 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);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- interface.c 13 Jan 2007 23:56:28 -0000 1.9
+++ interface.c 14 Jan 2007 10:06:41 -0000 1.10
@@ -1004,6 +1004,7 @@
//UI_PartsTree
UI_PartsTree = etk_tree2_new();
+ etk_widget_padding_set(UI_PartsTree,2,2,2,2);
etk_tree2_mode_set (ETK_TREE2(UI_PartsTree), ETK_TREE2_MODE_TREE);
etk_widget_size_request_set(UI_PartsTree, 260, 300);
col = etk_tree2_col_new(ETK_TREE2(UI_PartsTree), "File contents",100,0);
@@ -1012,6 +1013,7 @@
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);
@@ -1694,6 +1696,7 @@
//canvas
ETK_canvas = etk_canvas_new ();
+ etk_widget_padding_set(ETK_canvas,4,4,4,4);
etk_widget_size_request_set(ETK_canvas, 300, 300);
etk_box_append(ETK_BOX(hbox), ETK_canvas, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-------------------------------------------------------------------------
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
