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.h
Log Message:
* manage swallow parts
* fix group max e min value
* some line cutted to fit 80col
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- callbacks.c 23 Feb 2008 18:54:41 -0000 1.60
+++ callbacks.c 24 Feb 2008 03:52:58 -0000 1.61
@@ -481,6 +481,10 @@
etk_tree_row_fields_set(row,TRUE,
COL_NAME, EdjeFile, "TEXT.PNG", name, NULL);
break;
+ case EDJE_PART_TYPE_SWALLOW:
+ etk_tree_row_fields_set(row,TRUE,
+ COL_NAME, EdjeFile, "SWAL.PNG", name, NULL);
+ break;
default:
etk_tree_row_fields_set(row,TRUE,
COL_NAME, EdjeFile, "NONE.PNG", name, NULL);
@@ -1466,6 +1470,29 @@
"Something to say !");
edje_edit_part_effect_set(edje_o, name, EDJE_TEXT_EFFECT_GLOW);
+ etk_tree_row_select(row);
+ etk_tree_row_unfold(row);
+ PopulateRelComboBoxes();
+ PopulateSourceComboEntry();
+ break;
+ case NEW_SWAL:
+ if (!etk_string_length_get(Cur.group))
+ {
+ ShowAlert("You must first select a group.");
+ break;
+ }
+ //generate a unique new name
+ snprintf(name, sizeof(name), "New swallow");
+ i = 2;
+ while (edje_edit_part_exist(edje_o, name))
+ snprintf(name, sizeof(name), "New swallow %d", i++);
+
+ if (!edje_edit_part_add(edje_o, name, EDJE_PART_TYPE_SWALLOW))
+ {
+ ShowAlert("Can't create part.");
+ break;
+ }
+ row = AddPartToTree(name, NULL);
etk_tree_row_select(row);
etk_tree_row_unfold(row);
PopulateRelComboBoxes();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- evas.c 23 Feb 2008 03:54:46 -0000 1.30
+++ evas.c 24 Feb 2008 03:52:58 -0000 1.31
@@ -280,6 +280,12 @@
evas_object_resize(focus_handler,
pw + o1x - o2x + 2,
ph + o1y - o2y + 2);
+
+ if (edje_edit_part_type_get(edje_o, Cur.part->string) ==
EDJE_PART_TYPE_SWALLOW)
+ edje_object_signal_emit(focus_handler, "SwallShow", "edje_editor");
+ else
+ edje_object_signal_emit(focus_handler, "SwallHide", "edje_editor");
+
evas_object_raise(focus_handler);
evas_object_show(focus_handler);
}else
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- interface.c 23 Feb 2008 03:54:46 -0000 1.64
+++ interface.c 24 Feb 2008 03:52:58 -0000 1.65
@@ -133,6 +133,7 @@
case EDJE_PART_TYPE_IMAGE: strcpy(buf,"IMAGE.PNG"); break;
case EDJE_PART_TYPE_TEXT: strcpy(buf,"TEXT.PNG"); break;
case EDJE_PART_TYPE_RECTANGLE: strcpy(buf,"RECT.PNG"); break;
+ case EDJE_PART_TYPE_SWALLOW: strcpy(buf,"SWAL.PNG"); break;
default: strcpy(buf,"NONE.PNG"); break;
}
@@ -382,6 +383,8 @@
snprintf(buf, 19,"TEXT.PNG");
else if (type == EDJE_PART_TYPE_IMAGE)
snprintf(buf, 19,"IMAGE.PNG");
+ else if (type == EDJE_PART_TYPE_SWALLOW)
+ snprintf(buf, 19,"SWAL.PNG");
else snprintf(buf, 19,"NONE.PNG");
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox),
@@ -460,6 +463,7 @@
case EDJE_PART_TYPE_IMAGE: strcpy(buf,"IMAGE.PNG"); break;
case EDJE_PART_TYPE_TEXT: strcpy(buf,"TEXT.PNG"); break;
case EDJE_PART_TYPE_RECTANGLE: strcpy(buf,"RECT.PNG"); break;
+ case EDJE_PART_TYPE_SWALLOW: strcpy(buf,"SWAL.PNG"); break;
default: strcpy(buf,"NONE.PNG"); break;
}
@@ -522,11 +526,20 @@
UpdateGroupFrame(void)
{
//Stop signal propagation
- etk_signal_block("text-changed", ETK_OBJECT(UI_GroupNameEntry),
on_NamesEntry_text_changed, NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MINW_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMinHSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MINH_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MAXW_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MAXH_SPINNER);
+ etk_signal_block("text-changed", ETK_OBJECT(UI_GroupNameEntry),
+ on_NamesEntry_text_changed, NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MINW_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMinHSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MINH_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MAXW_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MAXH_SPINNER);
if (etk_string_length_get(Cur.group))
{
@@ -535,21 +548,31 @@
etk_widget_hide(ETK_WIDGET(UI_GroupNameEntryImage));
//Update min e max spinners
- Evas_Coord w, h;
- edje_object_size_min_get(edje_o, &w, &h);
- etk_range_value_set(ETK_RANGE(UI_GroupMinWSpinner), (float)w);
- etk_range_value_set(ETK_RANGE(UI_GroupMinHSpinner), (float)h);
- edje_object_size_max_get(edje_o, &w, &h);
- etk_range_value_set(ETK_RANGE(UI_GroupMaxWSpinner), (float)w);
- etk_range_value_set(ETK_RANGE(UI_GroupMaxHSpinner), (float)h);
+ etk_range_value_set(ETK_RANGE(UI_GroupMinWSpinner),
+ (float)edje_edit_group_min_w_get(edje_o));
+ etk_range_value_set(ETK_RANGE(UI_GroupMinHSpinner),
+ (float)edje_edit_group_min_h_get(edje_o));
+ etk_range_value_set(ETK_RANGE(UI_GroupMaxWSpinner),
+ (float)edje_edit_group_max_w_get(edje_o));
+ etk_range_value_set(ETK_RANGE(UI_GroupMaxHSpinner),
+ (float)edje_edit_group_max_h_get(edje_o));
}
//ReEnable Signal Propagation
- etk_signal_unblock("text-changed",
ETK_OBJECT(UI_GroupNameEntry),on_NamesEntry_text_changed, NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MINW_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinHSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MINH_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MAXW_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MAXH_SPINNER);
+ etk_signal_unblock("text-changed", ETK_OBJECT(UI_GroupNameEntry),
+ on_NamesEntry_text_changed, NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MINW_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinHSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MINH_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MAXW_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner),
+ ETK_CALLBACK(on_GroupSpinner_value_changed),
+ (void *)MAXH_SPINNER);
}
@@ -622,16 +645,28 @@
UpdateDescriptionFrame(void)
{
//Stop signal propagation
- etk_signal_block("text-changed",
ETK_OBJECT(UI_StateEntry),on_NamesEntry_text_changed, NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_AspectComboBox),
ETK_CALLBACK(on_AspectComboBox_changed), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_StateMinWSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_StateMinHSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_StateMaxWSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), (void*)STATE_ALIGNV_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), (void*)STATE_ALIGNH_SPINNER);
+ etk_signal_block("text-changed", ETK_OBJECT(UI_StateEntry),
+ on_NamesEntry_text_changed, NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
+ ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
+ ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_AspectComboBox),
+ ETK_CALLBACK(on_AspectComboBox_changed), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_StateMinWSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_StateMinHSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_StateMaxWSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ (void*)STATE_ALIGNV_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ (void*)STATE_ALIGNH_SPINNER);
if (etk_string_length_get(Cur.state))
{
@@ -673,16 +708,28 @@
}
//ReEnable Signal Propagation
- etk_signal_unblock("text-changed",
ETK_OBJECT(UI_StateEntry),on_NamesEntry_text_changed, NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_AspectComboBox),
ETK_CALLBACK(on_AspectComboBox_changed), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMinWSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMinHSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMaxWSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), (void*)STATE_ALIGNV_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), (void*)STATE_ALIGNH_SPINNER);
+ etk_signal_unblock("text-changed", ETK_OBJECT(UI_StateEntry),
+ on_NamesEntry_text_changed, NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
+ ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
+ ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_AspectComboBox),
+ ETK_CALLBACK(on_AspectComboBox_changed), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMinWSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMinHSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMaxWSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
+ ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ (void*)STATE_ALIGNV_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ (void*)STATE_ALIGNH_SPINNER);
}
@@ -696,7 +743,8 @@
edje_edit_state_color_get(edje_o, Cur.part->string, Cur.state->string,
&color.r, &color.g, &color.b, &color.a);
- etk_signal_block("color-changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(on_ColorDialog_change), NULL);
+ etk_signal_block("color-changed", ETK_OBJECT(UI_ColorPicker),
+ ETK_CALLBACK(on_ColorDialog_change), NULL);
//Set ColorPicker
etk_colorpicker_current_color_set (ETK_COLORPICKER(UI_ColorPicker),
color);
@@ -704,7 +752,8 @@
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("color-changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(on_ColorDialog_change), NULL);
+ etk_signal_unblock("color-changed", ETK_OBJECT(UI_ColorPicker),
+ ETK_CALLBACK(on_ColorDialog_change), NULL);
}
}
@@ -717,12 +766,18 @@
const char *pi;
//Stop signal propagation
-
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderLeftSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_LEFT);
-
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderRightSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_RIGHT);
-
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderTopSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_TOP);
-
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderBottomSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_BOTTOM);
-
etk_signal_block("value-changed",ETK_OBJECT(UI_ImageAlphaSlider),ETK_CALLBACK(on_ImageAlphaSlider_value_changed),
NULL);
- etk_signal_block("item-activated", ETK_OBJECT(UI_ImageComboBox),
ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
+ etk_signal_block("value-changed",ETK_OBJECT(UI_BorderLeftSpinner),
+ ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_LEFT);
+ etk_signal_block("value-changed",ETK_OBJECT(UI_BorderRightSpinner),
+ ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_RIGHT);
+ etk_signal_block("value-changed",ETK_OBJECT(UI_BorderTopSpinner),
+ ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_TOP);
+ etk_signal_block("value-changed",ETK_OBJECT(UI_BorderBottomSpinner),
+ ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_BOTTOM);
+ etk_signal_block("value-changed",ETK_OBJECT(UI_ImageAlphaSlider),
+ ETK_CALLBACK(on_ImageAlphaSlider_value_changed), NULL);
+ etk_signal_block("item-activated", ETK_OBJECT(UI_ImageComboBox),
+ ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
@@ -768,12 +823,18 @@
etk_range_value_set(ETK_RANGE(UI_BorderBottomSpinner), b);
//ReEnable Signal Propagation
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderLeftSpinner),
on_BorderSpinner_value_changed, (void*)BORDER_LEFT);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderRightSpinner),
on_BorderSpinner_value_changed, (void*)BORDER_RIGHT);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderTopSpinner),
on_BorderSpinner_value_changed, (void*)BORDER_TOP);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderBottomSpinner),
on_BorderSpinner_value_changed, (void*)BORDER_BOTTOM);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_ImageAlphaSlider),
on_ImageAlphaSlider_value_changed, NULL);
- etk_signal_unblock("item-activated", ETK_OBJECT(UI_ImageComboBox),
ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderLeftSpinner),
+ on_BorderSpinner_value_changed, (void*)BORDER_LEFT);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderRightSpinner),
+ on_BorderSpinner_value_changed, (void*)BORDER_RIGHT);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderTopSpinner),
+ on_BorderSpinner_value_changed, (void*)BORDER_TOP);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderBottomSpinner),
+ on_BorderSpinner_value_changed, (void*)BORDER_BOTTOM);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_ImageAlphaSlider),
+ on_ImageAlphaSlider_value_changed, NULL);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_ImageComboBox),
+ ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
}
@@ -794,10 +855,14 @@
printf("Update Text Frame: %s\n",Cur.state->string);
//Stop signal propagation
-
etk_signal_block("text-changed",ETK_OBJECT(UI_TextEntry),on_TextEntry_text_changed,
NULL);
- etk_signal_block("item-activated", ETK_OBJECT(UI_FontComboBox),
ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ etk_signal_block("text-changed", ETK_OBJECT(UI_TextEntry),
+ on_TextEntry_text_changed, NULL);
+ etk_signal_block("item-activated", ETK_OBJECT(UI_FontComboBox),
+ ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
//Set Text Text in Cur.eps
@@ -862,10 +927,14 @@
evas_object_color_set(OutlineColorObject, r, g, b, 255);
//Renable signal propagation
- etk_signal_unblock("text-changed", ETK_OBJECT(UI_TextEntry),
ETK_CALLBACK(on_TextEntry_text_changed), NULL);
- etk_signal_unblock("item-activated", ETK_OBJECT(UI_FontComboBox),
ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ etk_signal_unblock("text-changed", ETK_OBJECT(UI_TextEntry),
+ ETK_CALLBACK(on_TextEntry_text_changed), NULL);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_FontComboBox),
+ ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
}
void
@@ -873,14 +942,30 @@
{
//printf("Update Position: %s (offset:
%d)\n",Cur.eps->name,Cur.eps->rel1.offset.x);
//Stop signal propagation
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL1X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL1Y_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL2X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL2Y_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL1X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL1Y_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL2X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL2Y_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL1X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL1Y_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL2X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL2Y_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL1X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL1Y_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL2X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL2Y_SPINNER);
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
@@ -904,14 +989,30 @@
edje_edit_state_rel2_offset_y_get(edje_o,
Cur.part->string,Cur.state->string));
//Reenable signal propagation
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL1X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL1Y_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL2X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
ETK_CALLBACK(on_RelSpinner_value_changed), (void*)REL2Y_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL1X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL1Y_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL2X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void*)REL2Y_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL1X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL1Y_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL2X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
+ ETK_CALLBACK(on_RelSpinner_value_changed),
+ (void*)REL2Y_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL1X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL1Y_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL2X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
+ ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
+ (void*)REL2Y_SPINNER);
}
void
@@ -1327,6 +1428,14 @@
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(on_AddMenu_item_activated), (void*)NEW_TEXT);
+ etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
+
+ //New Swallow
+ menu_item = etk_menu_item_image_new_with_label("Swallow");
+ image = etk_image_new_from_edje(EdjeFile,"SWAL.PNG");
+ etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
+ etk_signal_connect("activated", ETK_OBJECT(menu_item),
+ ETK_CALLBACK(on_AddMenu_item_activated), (void*)NEW_SWAL);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//New Program
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- main.h 23 Feb 2008 03:54:46 -0000 1.29
+++ main.h 24 Feb 2008 03:52:59 -0000 1.30
@@ -68,6 +68,7 @@
NEW_IMAGE,
NEW_RECT,
NEW_TEXT,
+ NEW_SWAL,
NEW_PROG,
NEW_DESC,
NEW_GROUP,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
