Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c interface.h
Log Message:
A small fix and a new label that show the current group size.
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- callbacks.c 31 Mar 2007 23:27:46 -0000 1.19
+++ callbacks.c 23 May 2007 01:06:23 -0000 1.20
@@ -52,7 +52,7 @@
case TOOLBAR_SAVE:
printf("Clicked signal on Toolbar Button 'Save' EMITTED\n");
if (Cur.open_file_name)
- engrave_edj_output(Cur.ef,Cur.open_file_name);
+ engrave_edj_output(Cur.ef,Cur.open_file_name);
else
ShowFilechooser(FILECHOOSER_SAVE_EDJ);
break;
@@ -281,23 +281,23 @@
case MINW_SPINNER:
printf("MINW\n");
engrave_group_min_size_set(Cur.eg,
- etk_range_value_get(ETK_RANGE(UI_GroupMinWSpinner)),
+ value,
etk_range_value_get(ETK_RANGE(UI_GroupMinHSpinner)));
break;
case MINH_SPINNER:
engrave_group_min_size_set(Cur.eg,
etk_range_value_get(ETK_RANGE(UI_GroupMinWSpinner)),
- etk_range_value_get(ETK_RANGE(UI_GroupMinHSpinner)));
+ value);
break;
case MAXW_SPINNER:
engrave_group_max_size_set(Cur.eg,
- etk_range_value_get(ETK_RANGE(UI_GroupMaxWSpinner)),
+ value,
etk_range_value_get(ETK_RANGE(UI_GroupMaxHSpinner)));
break;
case MAXH_SPINNER:
engrave_group_max_size_set(Cur.eg,
etk_range_value_get(ETK_RANGE(UI_GroupMaxWSpinner)),
- etk_range_value_get(ETK_RANGE(UI_GroupMaxHSpinner)));
+ value);
break;
}
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas.c 13 Mar 2007 04:10:34 -0000 1.12
+++ evas.c 23 May 2007 01:06:24 -0000 1.13
@@ -339,7 +339,7 @@
engrave_group_max_size_get(Cur.eg, &max_w, &max_h);
engrave_group_min_size_get(Cur.eg, &min_w, &min_h);
-
+
if (max_w > 0 && w > max_w) w = max_w;
if (max_h > 0 && h > max_h) h = max_h;
@@ -349,10 +349,12 @@
if (w < 0) w = 100;
if (h < 0) h = 100;
- //printf("RESIZE: %d %d./ed \n",w,h);
evas_object_resize(EV_fakewin, w, h);
evas_object_resize(EV_movebox, w, 10);
edje_object_part_drag_value_set (EV_fakewin, "miniarrow", (double)w,
(double)h);
+ char buf[100];
+ snprintf(buf,100,"Current size: %d x %d",w,h);
+ etk_label_set (UI_CurrentGroupSizeLabel, buf);
}
void
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- interface.c 6 Apr 2007 09:16:51 -0000 1.24
+++ interface.c 23 May 2007 01:06:24 -0000 1.25
@@ -1122,7 +1122,10 @@
UI_GroupNameEntry = etk_entry_new();
etk_box_append(ETK_BOX(hbox), UI_GroupNameEntry, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-
+ //CurrentSizeLabel
+ UI_CurrentGroupSizeLabel = etk_label_new("Current size: 0 x 0");
+ etk_box_append(ETK_BOX(vbox), UI_CurrentGroupSizeLabel, ETK_BOX_START,
ETK_BOX_NONE, 0);
+
//hbox
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- interface.h 13 Mar 2007 04:43:18 -0000 1.11
+++ interface.h 23 May 2007 01:06:24 -0000 1.12
@@ -90,6 +90,7 @@
Etk_Widget *UI_Param2Label;
Etk_Widget *UI_DelayFromSpinner;
Etk_Widget *UI_DelayRangeSpinner;
+Etk_Widget *UI_CurrentGroupSizeLabel;
void create_main_window (void);
void PopulateTree (void);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
