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
Log Message:
DIRECT EDJE: (need edje patch v8 on bugzilla #294)
*all side frames now works well
*move group combobox from toolbar to tree
*done rename of group, part and description
*update fakewin title when needed
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- callbacks.c 28 Dec 2007 23:22:30 -0000 1.45
+++ callbacks.c 7 Feb 2008 17:29:53 -0000 1.46
@@ -37,6 +37,17 @@
printf("CALLBACK for \"%s\" \"%s\"\n", sig, src);
}
+/* Group combobox callback */
+#if TEST_DIRECT_EDJE
+Etk_Bool
+on_GroupsComboBox_activated(Etk_Combobox *combobox, Etk_Combobox_Item *item,
void *data)
+{
+ char *gr;
+ gr = etk_combobox_item_field_get(item,0);
+ printf("Group combo activated: %s\n",gr);
+ ChangeGroup(gr);
+}
+#endif
/* All the buttons Callback */
Etk_Bool
on_AllButton_click(Etk_Button *button, void *data)
@@ -303,7 +314,7 @@
edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"image_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"group_frame_hide","edje_editor");
+ edje_object_signal_emit(edje_ui,"group_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"program_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"part_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"script_frame_hide","edje_editor");
@@ -316,9 +327,11 @@
Cur.part = etk_string_set(Cur.part, parent_name);
edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string);
-
+
+ UpdateDescriptionFrame();
UpdatePositionFrame();
UpdateComboPositionFrame();
+
switch(edje_edit_part_type_get(edje_o, Cur.part->string))
{
case EDJE_PART_TYPE_RECTANGLE:
@@ -342,7 +355,7 @@
}
edje_object_signal_emit(edje_ui,"part_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"group_frame_hide","edje_editor");
+ edje_object_signal_emit(edje_ui,"group_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"program_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"script_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"description_frame_show","edje_editor");
@@ -359,7 +372,7 @@
edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"image_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"group_frame_hide","edje_editor");
+ edje_object_signal_emit(edje_ui,"group_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"part_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"program_frame_show","edje_editor");
@@ -523,9 +536,25 @@
Etk_Bool
on_GroupNameEntry_text_changed(Etk_Object *object, void *data)
{
- Etk_Tree_Col *col1=NULL;
-
printf("Text Changed Signal on PartNameEntry EMITTED (text:
%s)\n",etk_entry_text_get(ETK_ENTRY(object)));
+#if TEST_DIRECT_EDJE
+ char *name;
+ name = etk_entry_text_get(ETK_ENTRY(object));
+
+ edje_edit_group_name_set(edje_o, Cur.group->string, name);
+
+ //Update Group Combobox
+ Etk_Combobox_Item *item;
+ item = etk_combobox_active_item_get(ETK_COMBOBOX(UI_GroupsComboBox));
+ etk_signal_block("item-activated",ETK_OBJECT(UI_GroupsComboBox),
on_GroupsComboBox_activated, NULL);
+ etk_combobox_item_fields_set(item, name);
+ etk_signal_unblock("item-activated",ETK_OBJECT(UI_GroupsComboBox),
on_GroupsComboBox_activated, NULL);
+
+ //Update FakeWin title
+ edje_object_part_text_set(EV_fakewin, "title", name);
+
+#else
+ Etk_Tree_Col *col1=NULL;
if (Cur.eg && ecore_hash_get(hash,Cur.eg))
{
engrave_group_name_set(Cur.eg,etk_entry_text_get(ETK_ENTRY(object)));
@@ -540,6 +569,7 @@
edje_object_part_text_set (EV_fakewin,
"title", engrave_group_name_get(Cur.eg));
}
+#endif
return ETK_TRUE;
}
@@ -548,6 +578,28 @@
on_GroupSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Group Spinners value changed signal EMIT\n");
+#if TEST_DIRECT_EDJE
+ if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
+ switch ((int)data)
+ {
+ case MINW_SPINNER:
+ edje_edit_group_min_w_set(edje_o,
+ (int)etk_range_value_get(ETK_RANGE(UI_GroupMinWSpinner)));
+ break;
+ case MINH_SPINNER:
+ edje_edit_group_min_h_set(edje_o,
+ (int)etk_range_value_get(ETK_RANGE(UI_GroupMinHSpinner)));
+ break;
+ case MAXW_SPINNER:
+ edje_edit_group_max_w_set(edje_o,
+ (int)etk_range_value_get(ETK_RANGE(UI_GroupMaxWSpinner)));
+ break;
+ case MAXH_SPINNER:
+ edje_edit_group_max_h_set(edje_o,
+ (int)etk_range_value_get(ETK_RANGE(UI_GroupMaxHSpinner)));
+ break;
+ }
+#else
if (Cur.eg)
{
switch ((int)data)
@@ -575,7 +627,7 @@
break;
}
}
-
+#endif
return ETK_TRUE;
}
@@ -588,7 +640,7 @@
char *text;
//printf("Text Changed Signal on PartNameEntry EMITTED (text:
%s)\n",etk_entry_text_get(ETK_ENTRY(object)));
#if TEST_DIRECT_EDJE
- if (etk_string_length_get(Cur.part->string))
+ if (etk_string_length_get(Cur.part))
{
//Update PartTree
row = etk_tree_selected_row_get(ETK_TREE(UI_PartsTree));
@@ -716,7 +768,41 @@
char buf[4096];
const char *nn; //new name
printf("Text Changed Signal on StateEntry EMITTED\n");
-
+#if TEST_DIRECT_EDJE
+ if (etk_string_length_get(Cur.state))
+ {
+ if (strcmp("default 0.00", Cur.state->string))
+ {
+ nn = etk_entry_text_get(ETK_ENTRY(object));
+ if (edje_edit_state_name_set(edje_o, Cur.part->string,
Cur.state->string, nn))
+ {
+ /* update tree */
+ Etk_Tree_Row *row;
+ row = etk_tree_selected_row_get(ETK_TREE(UI_PartsTree));
+ etk_tree_row_fields_set(row,TRUE,
+ COL_NAME, EdjeFile, "DESC.PNG", nn,
+ NULL);
+ /* update Cur */
+ Cur.state = etk_string_set(Cur.state, nn);
+
+ }
+ else
+ {
+ ShowAlert("<b>Wrong name format</b><br>Name must be in the
form:<br>\"default 0.00\"");
+ }
+ }
+ else
+ {
+ ShowAlert("You can't rename default 0.0");
+ etk_signal_block("text-changed",ETK_OBJECT(object),
+ on_StateEntry_text_changed, NULL);
+ etk_entry_text_set(ETK_ENTRY(object), Cur.state->string);
+ etk_signal_unblock("text-changed",ETK_OBJECT(object),
+ on_StateEntry_text_changed, NULL);
+ }
+ }
+
+#else
if (Cur.eps)
{
printf("FOLLOW %s %f\n",Cur.eps->name,Cur.eps->value);
@@ -735,13 +821,14 @@
etk_tree_row_fields_set(ecore_hash_get(hash,Cur.eps),TRUE,
col1,EdjeFile,"DESC.PNG",buf,NULL);
}
-
+#endif
return ETK_TRUE;
}
Etk_Bool
on_StateIndexSpinner_value_changed(Etk_Range *range, double value, void *data)
{
+ //TODO remove this function when switch to edje internal
char buf[4096];
Etk_Tree_Col *col1=NULL;
@@ -771,21 +858,33 @@
on_AspectSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Value Changed Signal on AspectMinSpinner EMITTED\n");
+#if TEST_DIRECT_EDJE
+ edje_edit_state_aspect_min_set(edje_o, Cur.part->string, Cur.state->string,
+
etk_range_value_get(ETK_RANGE(UI_AspectMinSpinner)));
+ edje_edit_state_aspect_max_set(edje_o, Cur.part->string, Cur.state->string,
+
etk_range_value_get(ETK_RANGE(UI_AspectMaxSpinner)));
+#else
engrave_part_state_aspect_set(Cur.eps,
etk_range_value_get(ETK_RANGE(UI_AspectMinSpinner)),
etk_range_value_get(ETK_RANGE(UI_AspectMaxSpinner)));
+#endif
return ETK_TRUE;
}
Etk_Bool
on_AspectComboBox_changed(Etk_Combobox *combobox, void *data)
{
- Engrave_Aspect_Preference prefer;
printf("Active Item Changed Signal on AspectComboBox EMITTED\n");
+#if TEST_DIRECT_EDJE
+ unsigned char pref;
+ pref = etk_combobox_item_data_get(etk_combobox_active_item_get (combobox));
+ edje_edit_state_aspect_pref_set(edje_o, Cur.part->string,
Cur.state->string, pref);
+#else
+ Engrave_Aspect_Preference prefer;
prefer =
(Engrave_Aspect_Preference)etk_combobox_item_data_get(etk_combobox_active_item_get
(combobox));
engrave_part_state_aspect_preference_set(Cur.eps,prefer);
-
+#endif
return ETK_TRUE;
}
@@ -793,7 +892,16 @@
on_StateMinMaxSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Active Item Changed Signal on MinMaxSpinners EMITTED\n");
-
+#if TEST_DIRECT_EDJE
+ edje_edit_state_min_w_set(edje_o, Cur.part->string, Cur.state->string,
+
etk_range_value_get(ETK_RANGE(UI_StateMinWSpinner)));
+ edje_edit_state_min_h_set(edje_o, Cur.part->string, Cur.state->string,
+
etk_range_value_get(ETK_RANGE(UI_StateMinHSpinner)));
+ edje_edit_state_max_w_set(edje_o, Cur.part->string, Cur.state->string,
+
etk_range_value_get(ETK_RANGE(UI_StateMaxWSpinner)));
+ edje_edit_state_max_h_set(edje_o, Cur.part->string, Cur.state->string,
+
etk_range_value_get(ETK_RANGE(UI_StateMaxHSpinner)));
+#else
engrave_part_state_min_size_set(Cur.eps,
etk_range_value_get(ETK_RANGE(UI_StateMinWSpinner)),
etk_range_value_get(ETK_RANGE(UI_StateMinHSpinner)));
@@ -801,7 +909,7 @@
engrave_part_state_max_size_set(Cur.eps,
etk_range_value_get(ETK_RANGE(UI_StateMaxWSpinner)),
etk_range_value_get(ETK_RANGE(UI_StateMaxHSpinner)));
-
+#endif
ev_redraw();
return ETK_TRUE;
}
@@ -1207,6 +1315,12 @@
if (data == TEXT_ALIGNV_SPINNER)
edje_edit_state_text_align_y_set(edje_o, Cur.part->string,
Cur.state->string,
(double)etk_range_value_get(range));
+ if (data == STATE_ALIGNH_SPINNER)
+ edje_edit_state_align_x_set(edje_o, Cur.part->string, Cur.state->string,
+ (double)etk_range_value_get(range));
+ if (data == STATE_ALIGNV_SPINNER)
+ edje_edit_state_align_y_set(edje_o, Cur.part->string, Cur.state->string,
+ (double)etk_range_value_get(range));
#else
if (data == TEXT_ALIGNH_SPINNER)
engrave_part_state_text_align_set(Cur.eps, etk_range_value_get(range),
-1);
@@ -1444,16 +1558,7 @@
return ETK_TRUE;
}
-#if TEST_DIRECT_EDJE
-Etk_Bool
-on_GroupsComboBox_activated(Etk_Combobox *combobox, Etk_Combobox_Item *item,
void *data)
-{
- char *gr;
- gr = etk_combobox_item_field_get(item,0);
- printf("Group combo activated: %s\n",gr);
- ChangeGroup(gr);
-}
-#endif
+
Etk_Bool
on_TransitionComboBox_changed(Etk_Combobox *combobox, void *data)
{
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- evas.c 18 Dec 2007 06:20:49 -0000 1.24
+++ evas.c 7 Feb 2008 17:29:53 -0000 1.25
@@ -482,12 +482,18 @@
void
ev_resize_fake(int w, int h)
{
- int max_w=0, max_h=0;
- int min_w=0, min_h=0;
-
+ int max_w = 0;
+ int max_h = 0;
+ int min_w = 0;
+ int min_h = 0;
+#if TEST_DIRECT_EDJE
+ edje_object_size_min_get(edje_o, &min_w, &min_h);
+ edje_object_size_max_get(edje_o, &max_w, &max_h);
+#else
engrave_group_max_size_get(Cur.eg, &max_w, &max_h);
engrave_group_min_size_get(Cur.eg, &min_w, &min_h);
-
+#endif
+
if (max_w > 0 && w > max_w) w = max_w;
if (max_h > 0 && h > max_h) h = max_h;
@@ -531,8 +537,6 @@
//place engrave canvas
evas_object_move(edje_o, x, y);
evas_object_resize(edje_o, w+1, h);
- //This make engrave_canvas redraw (BAD!!)
-// engrave_canvas_current_group_set(engrave_canvas, Cur.eg);
evas_object_show(EV_fakewin);
evas_object_show(EV_movebox);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- interface.c 28 Dec 2007 23:01:41 -0000 1.51
+++ interface.c 7 Feb 2008 17:29:53 -0000 1.52
@@ -220,8 +220,7 @@
Evas_List *groups, *l;
//Stop signal propagation
- // etk_signal_disconnect("item-activated", ETK_OBJECT(UI_GroupsComboBox),
- // ETK_CALLBACK(on_GroupsComboBox_activated), NULL);
+ etk_signal_block("item-activated",ETK_OBJECT(UI_GroupsComboBox),
on_GroupsComboBox_activated, NULL);
etk_combobox_clear(ETK_COMBOBOX(UI_GroupsComboBox));
groups = edje_file_collection_list(Cur.edj_temp_name->string);
@@ -230,9 +229,8 @@
edje_file_collection_list_free(groups);
//Renable signal propagation
- // etk_signal_connect("item-activated", ETK_OBJECT(UI_GroupsComboBox),
- // ETK_CALLBACK(on_GroupsComboBox_activated), NULL);
-
+ etk_signal_unblock("item-activated",ETK_OBJECT(UI_GroupsComboBox),
on_GroupsComboBox_activated, NULL);
+
etk_combobox_active_item_set(ETK_COMBOBOX(UI_GroupsComboBox),
etk_combobox_first_item_get (ETK_COMBOBOX(UI_GroupsComboBox)));
}
@@ -564,12 +562,26 @@
UpdateGroupFrame(void)
{
//Stop signal propagation
-
etk_signal_block("text-changed",ETK_OBJECT(UI_GroupNameEntry),on_GroupNameEntry_text_changed,
NULL);
+ etk_signal_block("text-changed",ETK_OBJECT(UI_GroupNameEntry),
on_GroupNameEntry_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 TEST_DIRECT_EDJE
+ //Update name
+ etk_entry_text_set(ETK_ENTRY(UI_GroupNameEntry),Cur.group->string);
+
+ //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);
+
+#else
//Update name
etk_entry_text_set(ETK_ENTRY(UI_GroupNameEntry),Cur.eg->name);
@@ -578,7 +590,8 @@
etk_range_value_set (ETK_RANGE(UI_GroupMinHSpinner), Cur.eg->min.h);
etk_range_value_set (ETK_RANGE(UI_GroupMaxWSpinner), Cur.eg->max.w);
etk_range_value_set (ETK_RANGE(UI_GroupMaxHSpinner), Cur.eg->max.h);
-
+#endif
+
//ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_GroupNameEntry),on_GroupNameEntry_text_changed,
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MINW_SPINNER);
@@ -632,6 +645,54 @@
void
UpdateDescriptionFrame(void)
{
+ //Stop signal propagation
+
etk_signal_block("text-changed",ETK_OBJECT(UI_StateEntry),on_StateEntry_text_changed,
NULL);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_StateIndexSpinner),
ETK_CALLBACK(on_StateIndexSpinner_value_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 TEST_DIRECT_EDJE
+ if (etk_string_length_get(Cur.state))
+ {
+ //Set description name & index
+ etk_entry_text_set(ETK_ENTRY(UI_StateEntry),Cur.state->string);
+
+ //Set aspect min & max
+ etk_range_value_set(ETK_RANGE(UI_AspectMinSpinner),
+ edje_edit_state_aspect_min_get(edje_o, Cur.part->string,
Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_AspectMaxSpinner),
+ edje_edit_state_aspect_max_get(edje_o, Cur.part->string,
Cur.state->string));
+
+ //Set aspect pref Combo
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_AspectComboBox),
+ etk_combobox_nth_item_get (ETK_COMBOBOX(UI_AspectComboBox),
+ edje_edit_state_aspect_pref_get(edje_o, Cur.part->string,
Cur.state->string)));
+
+ //Set min e max size
+ etk_range_value_set(ETK_RANGE(UI_StateMinWSpinner),
+ edje_edit_state_min_w_get(edje_o, Cur.part->string,
Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_StateMinHSpinner),
+ edje_edit_state_min_h_get(edje_o, Cur.part->string,
Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_StateMaxWSpinner),
+ edje_edit_state_max_w_get(edje_o, Cur.part->string,
Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_StateMaxHSpinner),
+ edje_edit_state_max_h_get(edje_o, Cur.part->string,
Cur.state->string));
+
+
+ //Set description align & valign
+ etk_range_value_set(ETK_RANGE(UI_StateAlignHSpinner),
+ edje_edit_state_align_x_get(edje_o, Cur.part->string,
Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_StateAlignVSpinner),
+ edje_edit_state_align_y_get(edje_o, Cur.part->string,
Cur.state->string));
+ }
+#else
if (Cur.eps)
{
const char *name;
@@ -643,17 +704,6 @@
//printf("Update Description Frame: %s\n",Cur.eps->name);
- //Stop signal propagation
-
etk_signal_block("text-changed",ETK_OBJECT(UI_StateEntry),on_StateEntry_text_changed,
NULL);
- etk_signal_block("value-changed", ETK_OBJECT(UI_StateIndexSpinner),
ETK_CALLBACK(on_StateIndexSpinner_value_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);
-
//Set description name & index
name = engrave_part_state_name_get(Cur.eps,&index);
etk_entry_text_set(ETK_ENTRY(UI_StateEntry),name);
@@ -680,18 +730,21 @@
engrave_part_state_align_get(Cur.eps, &h, &v);
etk_range_value_set (ETK_RANGE(UI_StateAlignHSpinner), h);
etk_range_value_set (ETK_RANGE(UI_StateAlignVSpinner), v);
-
- //ReEnable Signal Propagation
-
etk_signal_unblock("text-changed",ETK_OBJECT(UI_StateEntry),on_StateEntry_text_changed,
NULL);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateIndexSpinner),
ETK_CALLBACK(on_StateIndexSpinner_value_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);
}
+#endif
+ //ReEnable Signal Propagation
+
etk_signal_unblock("text-changed",ETK_OBJECT(UI_StateEntry),on_StateEntry_text_changed,
NULL);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateIndexSpinner),
ETK_CALLBACK(on_StateIndexSpinner_value_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);
+
}
void
@@ -1875,24 +1928,12 @@
ETK_CALLBACK(on_AllButton_click),
(void*)TOOLBAR_DEBUG);
etk_object_properties_set(ETK_OBJECT(button),"label","Debug",NULL);
+#if TEST_DIRECT_EDJE
+
+#else
sep = etk_vseparator_new();
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), sep, ETK_BOX_START);
-#if TEST_DIRECT_EDJE
- //UI_GroupsComboBox
- UI_GroupsComboBox = etk_combobox_new();
- etk_combobox_column_add(ETK_COMBOBOX(UI_GroupsComboBox),
ETK_COMBOBOX_LABEL, 30, ETK_COMBOBOX_NONE, 0.0);
- etk_combobox_build(ETK_COMBOBOX(UI_GroupsComboBox));
- etk_widget_size_request_set(UI_GroupsComboBox,200, 10);
- etk_widget_padding_set (UI_GroupsComboBox, 0, 0, 7, 7);
- etk_combobox_items_height_set (ETK_COMBOBOX(UI_GroupsComboBox), 16);
- etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), UI_GroupsComboBox,
ETK_BOX_START);
-
- //etk_signal_connect("active-item-changed", ETK_OBJECT(UI_GroupsComboBox),
- // ETK_CALLBACK(on_GroupsComboBox_changed), NULL);
- etk_signal_connect("item-activated", ETK_OBJECT(UI_GroupsComboBox),
- ETK_CALLBACK(on_GroupsComboBox_activated), NULL);
-#else
//Test Button
button = etk_tool_button_new_from_stock( ETK_STOCK_MEDIA_PLAYBACK_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
@@ -1987,9 +2028,19 @@
Etk_Widget*
create_tree(void)
{
- Etk_Tree_Col *col;
+#if TEST_DIRECT_EDJE
+ //UI_GroupsComboBox
+ UI_GroupsComboBox = etk_combobox_new();
+ etk_combobox_column_add(ETK_COMBOBOX(UI_GroupsComboBox),
ETK_COMBOBOX_LABEL, 30, ETK_COMBOBOX_NONE, 0.0);
+ etk_combobox_build(ETK_COMBOBOX(UI_GroupsComboBox));
+ //etk_combobox_items_height_set (ETK_COMBOBOX(UI_GroupsComboBox), 18);
+
+ etk_signal_connect("item-activated", ETK_OBJECT(UI_GroupsComboBox),
+ ETK_CALLBACK(on_GroupsComboBox_activated), NULL);
+#endif
//UI_PartsTree
+ Etk_Tree_Col *col;
UI_PartsTree = etk_tree_new();
etk_widget_padding_set(UI_PartsTree,2,2,2,2);
etk_tree_mode_set (ETK_TREE(UI_PartsTree), ETK_TREE_MODE_TREE);
@@ -2023,8 +2074,16 @@
etk_signal_connect("row-selected", ETK_OBJECT(UI_PartsTree),
ETK_CALLBACK(on_PartsTree_row_selected), NULL);
-
- return UI_PartsTree;
+
+ //vbox
+ Etk_Widget *vbox;
+ vbox = etk_vbox_new(ETK_FALSE, 0);
+#if TEST_DIRECT_EDJE
+ etk_box_append(ETK_BOX(vbox), UI_GroupsComboBox, ETK_BOX_START,
ETK_BOX_NONE, 0);
+#endif
+ etk_box_append(ETK_BOX(vbox), UI_PartsTree, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+
+ return vbox;
}
Etk_Widget*
@@ -2049,13 +2108,13 @@
//StateEntry
UI_StateEntry = etk_entry_new();
etk_box_append(ETK_BOX(hbox), UI_StateEntry, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-
+#if !TEST_DIRECT_EDJE
//UI_StateIndexSpinner
UI_StateIndexSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.1, 1.0);
etk_spinner_digits_set (ETK_SPINNER(UI_StateIndexSpinner), 1);
etk_widget_size_request_set(UI_StateIndexSpinner,45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateIndexSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
-
+#endif
//hbox
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -2959,9 +3018,8 @@
void
create_main_window(void)
{
-
-
- //Create the man ecore_evas window
+
+ //Create the main ecore_evas window
UI_ecore_MainWin = ecore_evas_software_x11_new(NULL, 0, 0, 0, 32, 32);
ecore_evas_title_set(UI_ecore_MainWin, "Edje Editor");
ecore_evas_callback_resize_set(UI_ecore_MainWin, ecore_resize_callback);
@@ -2995,9 +3053,8 @@
evas_object_resize(etk_embed_object_get(ETK_EMBED(UI_ToolbarEmbed)), 0, 50);
//Tree
- create_tree();
UI_PartsTreeEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_PartsTreeEmbed), UI_PartsTree);
+ etk_container_add(ETK_CONTAINER(UI_PartsTreeEmbed), create_tree());
etk_embed_position_method_set(ETK_EMBED(UI_PartsTreeEmbed),
_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_PartsTreeEmbed);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- main.c 28 Dec 2007 23:22:30 -0000 1.26
+++ main.c 7 Feb 2008 17:29:53 -0000 1.27
@@ -427,6 +427,11 @@
PopulateTree2();
PopulateRelComboBoxes();
+
+ UpdateGroupFrame();
+
+ //update FakeWin title
+ edje_object_part_text_set(EV_fakewin, "title", group);
}
int
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
