Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
Makefile.am callbacks.c callbacks.h evas.c evas.h interface.c
interface.h main.c main.h
Log Message:
* Add a cool "console" that show all the signal that is triggered inside the
edje object.
* Nuked all remaining engrave dependencies
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 4 Aug 2007 21:22:21 -0000 1.3
+++ Makefile.am 18 Feb 2008 16:44:21 -0000 1.4
@@ -8,7 +8,6 @@
@ECORE_CFLAGS@ \
@ETK_CFLAGS@ \
@EVAS_CFLAGS@ \
[EMAIL PROTECTED]@ \
@EDJE_CFLAGS@
bin_PROGRAMS = edje_editor
@@ -17,15 +16,13 @@
callbacks.h \
evas.h \
interface.h \
-main.h \
-inout.h
+main.h
edje_editor_SOURCES = \
callbacks.c \
evas.c \
interface.c \
main.c \
-inout.c \
$(edje_editor_INCLUDES)
-edje_editor_LDADD = @ECORE_LIBS@ @ETK_LIBS@ @EVAS_LIBS@ @ENGRAVE_LIBS@
@EDJE_LIBS@
+edje_editor_LDADD = @ECORE_LIBS@ @ETK_LIBS@ @EVAS_LIBS@ @EDJE_LIBS@
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- callbacks.c 18 Feb 2008 02:58:14 -0000 1.52
+++ callbacks.c 18 Feb 2008 16:44:21 -0000 1.53
@@ -36,12 +36,19 @@
embed_object = etk_embed_object_get(ETK_EMBED(UI_PartsTreeEmbed));
evas_object_move(embed_object, 0, 55);
evas_object_resize(embed_object, TREE_WIDTH, win_h - 55);
+
+ evas_object_move(Consolle, TREE_WIDTH + 5, win_h - 80);
+ evas_object_resize(Consolle, 400, 75);
}
/* Catch all the signal from the editing edje object */
void
signal_cb(void *data, Evas_Object *o, const char *sig, const char *src)
{
- printf("CALLBACK for \"%s\" \"%s\"\n", sig, src);
+ char buf[1024];
+ consolle_count++;
+ snprintf(buf, sizeof(buf), "[%d] SIGNAL = '%s' SOURCE = '%s'",
+ consolle_count, sig, src);
+ ConsolleLog(buf);
}
/* Group combobox callback */
@@ -60,7 +67,6 @@
Etk_Bool
on_AllButton_click(Etk_Button *button, void *data)
{
- char cmd[1024];
Etk_String *text;
char *tween;
char *name;
@@ -196,34 +202,23 @@
//etk_menu_popup_at_xy (ETK_MENU(AddMenu), 10, 10);
break;
case TOOLBAR_OPTION_BG1:
- printf("SET_BG1\n");
edje_object_signal_emit(edje_ui,"set_bg1","edje_editor");
break;
case TOOLBAR_OPTION_BG2:
- printf("SET_BG2\n");
edje_object_signal_emit(edje_ui,"set_bg2","edje_editor");
break;
case TOOLBAR_OPTION_BG3:
- printf("SET_BG3\n");
edje_object_signal_emit(edje_ui,"set_bg3","edje_editor");
break;
case TOOLBAR_OPTION_BG4:
- printf("SET_BG4\n");
edje_object_signal_emit(edje_ui,"set_bg4","edje_editor");
break;
case TOOLBAR_PLAY:
- printf("Clicked signal on Toolbar Button 'Play' EMITTED\n");
- if (!Cur.eg)
- ShowAlert("You must select a group to test.");
- else if (!Cur.open_file_name)
- ShowAlert("You need to save the file before testing it.");
- else
- {
- snprintf(cmd,1024,"edje_editor -t \"%s\" \"%s\" &",
- Cur.open_file_name,Cur.eg->name);
- printf("TESTING EDJE. cmd: %s\n",cmd);
- system(cmd);
- }
+ ShowAlert("Not yet implemented");
+ // snprintf(cmd,1024,"edje_editor -t \"%s\" \"%s\" &",
+ // Cur.open_file_name,Cur.eg->name);
+ // printf("TESTING EDJE. cmd: %s\n",cmd);
+ // system(cmd);
break;
case TOOLBAR_DEBUG:
DebugInfo(FALSE);
@@ -533,35 +528,6 @@
}
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;
-
- printf("Value Changed Signal on StateIndexSpinner EMITTED\n");
- if (Cur.eps)
- {
- snprintf(buf,4096,"%s",engrave_part_state_name_get(Cur.eps,NULL));
- //RenameDescription(selected_desc,NULL,etk_range_value_get(range));
- if ((strcmp("default", buf)) || Cur.eps->value)
- {
- engrave_part_state_name_set(Cur.eps,buf,etk_range_value_get(range));
- }else
- {
- ShowAlert("You can't rename default 0.0");
- }
- //Update PartTree
- col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0);
- snprintf(buf,4095,"%s %.2f",Cur.eps->name,Cur.eps->value);
- etk_tree_row_fields_set(ecore_hash_get(hash,Cur.eps),TRUE,
- col1,EdjeFile,"DESC.PNG",buf,NULL);
- }
-
- return ETK_TRUE;
-}
-
-Etk_Bool
on_AspectSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Value Changed Signal on AspectMinSpinner EMITTED\n");
@@ -1155,7 +1121,6 @@
{
printf ("'%s'\n",tok);
edje_edit_program_after_add(edje_o, Cur.prog->string, tok);
- engrave_program_after_add(Cur.epr,tok);
tok = strtok (NULL, "|");
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- callbacks.h 17 Feb 2008 21:39:18 -0000 1.21
+++ callbacks.h 18 Feb 2008 16:44:22 -0000 1.22
@@ -37,7 +37,6 @@
Etk_Bool on_ImageTweenList_row_selected (Etk_Object *object, Etk_Tree_Row
*row, void *data);
Etk_Bool on_EffectComboBox_changed (Etk_Combobox *combobox, void
*data);
Etk_Bool on_AlertDialog_response (Etk_Dialog *dialog, int
response_id, void *data);
-Etk_Bool on_StateIndexSpinner_value_changed(Etk_Range *range, double value,
void *data);
Etk_Bool on_GroupNameEntry_text_changed (Etk_Object *object, void *data);
Etk_Bool on_AspectSpinner_value_changed (Etk_Range *range, double value,
void *data);
Etk_Bool on_AspectComboBox_changed (Etk_Combobox *combobox, void
*data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- evas.c 16 Feb 2008 16:53:00 -0000 1.27
+++ evas.c 18 Feb 2008 16:44:22 -0000 1.28
@@ -151,9 +151,6 @@
rel2Y_parent_handler =
evas_object_line_add(ecore_evas_get(UI_ecore_MainWin));
evas_object_color_set(rel2Y_parent_handler, 0, 0, 255, 200);
- //Create engrave canvas
- engrave_canvas = engrave_canvas_new(ecore_evas_get(UI_ecore_MainWin));
-
// Create Fake win
EV_fakewin = edje_object_add(ecore_evas_get(UI_ecore_MainWin));
edje_object_file_set(EV_fakewin, EdjeFile, "FakeWin");
@@ -170,6 +167,12 @@
evas_object_event_callback_add(EV_movebox, EVAS_CALLBACK_MOUSE_UP,
on_EndDrag, (void*)DRAG_MOVEBOX);
+ // Create Consolle
+ Consolle = edje_object_add(ecore_evas_get(UI_ecore_MainWin));
+ edje_object_file_set(Consolle, EdjeFile, "Consolle");
+ evas_object_show(Consolle);
+
+
//Place Fakewin
ev_move_fake(TREE_WIDTH+15,75);
ev_resize_fake(200,200);
@@ -384,7 +387,7 @@
//Get the geometry of fakewin
evas_object_geometry_get(EV_fakewin,&x,&y,&w,&h);
- //place engrave canvas
+ //place edje editing object
evas_object_move(edje_o, x, y);
evas_object_resize(edje_o, w+1, h);
@@ -402,7 +405,6 @@
}else
{
- evas_object_hide(engrave_canvas);
evas_object_hide(EV_fakewin);
evas_object_hide(EV_movebox);
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas.h 15 Feb 2008 21:41:21 -0000 1.5
+++ evas.h 18 Feb 2008 16:44:22 -0000 1.6
@@ -3,10 +3,8 @@
void ev_redraw(void);
void ev_draw_focus(void);
-void ev_draw_part(Engrave_Part* part);
void ev_resize_fake(int w, int h);
void ev_move_fake(int x, int y);
-void ev_hide_group(Engrave_Group* group);
void prepare_canvas(void);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- interface.c 18 Feb 2008 02:58:14 -0000 1.59
+++ interface.c 18 Feb 2008 16:44:22 -0000 1.60
@@ -8,6 +8,47 @@
#include "interface.h"
#include "evas.h"
+
+void
+ConsolleClear(void)
+{
+ edje_object_part_text_set(Consolle, "line1", "");
+ edje_object_part_text_set(Consolle, "line2", "");
+ edje_object_part_text_set(Consolle, "line3", "");
+ edje_object_part_text_set(Consolle, "line4", "");
+ edje_object_part_text_set(Consolle, "line5", "");
+
+ while(stack)
+ {
+ evas_stringshare_del(evas_list_data(stack));
+ stack = evas_list_remove_list(stack, stack);
+ }
+ consolle_count = 0;
+}
+void
+ConsolleLog(char *text)
+{
+ printf("LOG: %s\n", text);
+
+ stack = evas_list_prepend(stack, evas_stringshare_add(text));
+
+ while (evas_list_count(stack) > 5)
+ {
+ evas_stringshare_del(evas_list_data(evas_list_last(stack)));
+ stack = evas_list_remove_list(stack, evas_list_last(stack));
+ }
+
+ // if (evas_list_nth(stack, 0))
+ edje_object_part_text_set(Consolle, "line1", evas_list_nth(stack, 0));
+ // if (evas_list_nth(stack, 1))
+ edje_object_part_text_set(Consolle, "line2", evas_list_nth(stack, 1));
+ // if (evas_list_nth(stack, 2))
+ edje_object_part_text_set(Consolle, "line3", evas_list_nth(stack, 2));
+ // if (evas_list_nth(stack, 3))
+ edje_object_part_text_set(Consolle, "line4", evas_list_nth(stack, 3));
+ // if (evas_list_nth(stack, 4))
+ edje_object_part_text_set(Consolle, "line5", evas_list_nth(stack, 4));
+}
void
ShowAlert(char* text)
{
@@ -504,7 +545,6 @@
{
//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);
@@ -551,7 +591,6 @@
//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);
@@ -724,24 +763,13 @@
edje_edit_string_free(font);
//Set Effect ComboBox
- switch (edje_edit_part_effect_get(edje_o, Cur.part->string))
- {
- case ENGRAVE_TEXT_EFFECT_NONE: eff_num = 0; break;
- case ENGRAVE_TEXT_EFFECT_PLAIN: eff_num = 0; break;
- case ENGRAVE_TEXT_EFFECT_OUTLINE: eff_num = 1; break;
- case ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE: eff_num = 2; break;
- case ENGRAVE_TEXT_EFFECT_SHADOW: eff_num = 3; break;
- case ENGRAVE_TEXT_EFFECT_SOFT_SHADOW: eff_num = 4; break;
- case ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW: eff_num = 5; break;
- case ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: eff_num = 6; break;
- case ENGRAVE_TEXT_EFFECT_FAR_SHADOW: eff_num = 7; break;
- case ENGRAVE_TEXT_EFFECT_FAR_SOFT_SHADOW: eff_num = 8; break;
- case ENGRAVE_TEXT_EFFECT_GLOW: eff_num = 9; break;
- default: break; // remove warning
- }
+ eff_num = edje_edit_part_effect_get(edje_o, Cur.part->string);
+ eff_num--;
+ if (eff_num < 0) eff_num = 0;
+
etk_combobox_active_item_set(ETK_COMBOBOX(UI_EffectComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_EffectComboBox), eff_num));
-
+
//Set Text color Rects
edje_edit_state_color_get(edje_o, Cur.part->string,
Cur.state->string,&r,&g,&b,NULL);
evas_object_color_set(TextColorObject, r, g, b, 255);
@@ -1346,7 +1374,7 @@
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_OPTION_BG4);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
-#if DEBUG_BUTTON
+#if DEBUG_MODE
//DebugButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_PROPERTIES);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
@@ -1464,20 +1492,20 @@
etk_tree_col_expand_set(col,ETK_TRUE);
//Visibility column
col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "vis", 10,0);
- etk_tree_col_visible_set(col, DEBUG_TREE);
+ etk_tree_col_visible_set(col, DEBUG_MODE);
etk_tree_col_model_add(col,etk_tree_model_checkbox_new());
etk_tree_col_resizable_set(col, ETK_FALSE);
etk_tree_col_expand_set(col,ETK_FALSE);
//RowType column
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, DEBUG_TREE);
+ etk_tree_col_visible_set(col, DEBUG_MODE);
etk_tree_col_resizable_set(col, ETK_FALSE);
etk_tree_col_expand_set(col,ETK_FALSE);
//Parent part row
col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "parent",100, 0);
etk_tree_col_model_add(col,etk_tree_model_text_new());
- etk_tree_col_visible_set(col, DEBUG_TREE);
+ etk_tree_col_visible_set(col, DEBUG_MODE);
etk_tree_col_resizable_set(col, ETK_FALSE);
etk_tree_col_expand_set(col,ETK_FALSE);
etk_tree_build(ETK_TREE(UI_PartsTree));
@@ -1557,17 +1585,17 @@
etk_box_append(ETK_BOX(hbox),UI_AspectComboBox, ETK_BOX_START,
ETK_BOX_NONE, 0);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox),
"None");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_ASPECT_PREFERENCE_NONE);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_ASPECT_PREFER_NONE);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox),
"Vertical");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_ASPECT_PREFERENCE_VERTICAL);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_ASPECT_PREFER_VERTICAL);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox),
"Horizontal");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_ASPECT_PREFERENCE_HORIZONTAL);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_ASPECT_PREFER_HORIZONTAL);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox),
"Both");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_ASPECT_PREFERENCE_BOTH);
-
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_ASPECT_PREFER_BOTH);
+
//hbox
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -1631,8 +1659,6 @@
etk_signal_connect("text-changed", ETK_OBJECT(UI_StateEntry),
ETK_CALLBACK(on_StateEntry_text_changed), NULL);
-// etk_signal_connect("value-changed", ETK_OBJECT(UI_StateIndexSpinner),
-// ETK_CALLBACK(on_StateIndexSpinner_value_changed),
NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
@@ -1882,34 +1908,34 @@
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Plain");
- etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_PLAIN);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_TEXT_EFFECT_PLAIN);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Outline");
- etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_OUTLINE);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_TEXT_EFFECT_OUTLINE);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Soft Outline");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_TEXT_EFFECT_SOFT_OUTLINE);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Shadow");
- etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_SHADOW);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_TEXT_EFFECT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Soft Shadow");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_TEXT_EFFECT_SOFT_SHADOW);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_TEXT_EFFECT_SOFT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Outline Shadow");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW);
+ etk_combobox_item_data_set(ComboItem,
(void*)EDJE_TEXT_EFFECT_OUTLINE_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Outline Soft Shadow");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW);
+ etk_combobox_item_data_set(ComboItem,
(void*)EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Far Shadow");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_TEXT_EFFECT_FAR_SHADOW);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_TEXT_EFFECT_FAR_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Far Soft Shadow");
- etk_combobox_item_data_set(ComboItem,
(void*)ENGRAVE_TEXT_EFFECT_FAR_SOFT_SHADOW);
+ etk_combobox_item_data_set(ComboItem,
(void*)EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Glow");
- etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_GLOW);
+ etk_combobox_item_data_set(ComboItem, (void*)EDJE_TEXT_EFFECT_GLOW);
etk_table_attach_default(ETK_TABLE(table),UI_EffectComboBox,1,4,3,3);
@@ -2635,9 +2661,8 @@
//Create the main edje object to edit
edje_o = edje_object_add(UI_evas);
-#if ECHO_EDJE_SIGNAL
edje_object_signal_callback_add(edje_o, "*", "*", signal_cb, NULL);
-#endif
+
/*edje_object_signal_emit(edje_ui,"group_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"part_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"description_frame_show","edje_editor");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- interface.h 18 Feb 2008 02:58:14 -0000 1.29
+++ interface.h 18 Feb 2008 16:44:22 -0000 1.30
@@ -165,5 +165,7 @@
void ShowFilechooser(int FileChooserType);
void ShowAlert(char* text);
+void ConsolleLog(char *text);
+void ConsolleClear(void);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- main.c 18 Feb 2008 00:07:14 -0000 1.31
+++ main.c 18 Feb 2008 16:44:22 -0000 1.32
@@ -4,7 +4,6 @@
#include <Edje.h>
#include <Edje_Edit.h>
#include <Etk.h>
-#include <Engrave.h>
#include <Ecore_Str.h>
#include "evas.h"
@@ -138,6 +137,7 @@
printf("Change to group: %s\n", group);
edje_edit_save(edje_o);
evas_object_hide(edje_o);
+ ConsolleClear();
edje_object_file_set(edje_o, Cur.edj_temp_name->string, group);
evas_object_show(edje_o);
Parts_Hash = NULL; //TODO FREE
@@ -258,12 +258,10 @@
main(int argc, char **argv)
{
//Init Globals
- Cur.eg = NULL;
- Cur.ep = NULL;
- Cur.eps = NULL;
Cur.open_file_name = NULL;
Cur.source_dir = NULL;
Cur.main_source_file = NULL;
+ stack = NULL;
//Setting Globals
EdjeFile = PACKAGE_DATA_DIR"/edje_editor.edj";
@@ -304,13 +302,6 @@
{
printf("ERROR: Cannot init Ecore!\n");
return 1;
- }
-
-
- if (!(hash = ecore_hash_new(ecore_direct_hash,ecore_direct_compare)))
- {
- printf("Could not create hash!\n");
- return 1;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- main.h 16 Feb 2008 16:53:00 -0000 1.26
+++ main.h 18 Feb 2008 16:44:22 -0000 1.27
@@ -1,7 +1,6 @@
#ifndef _EDJE_EDITOR_MAIN_H_
#define _EDJE_EDITOR_MAIN_H_
-#include <Engrave.h>
#include <Edje.h>
#include <Ecore_Data.h>
#include <Ecore_File.h>
@@ -14,11 +13,9 @@
#define FAKEWIN_BORDER_BOTTOM 4
#define USE_GL_ENGINE 0
-#define ECHO_EDJE_SIGNAL 0
-#define DEBUG_TREE 0
-#define DEBUG_BUTTON 0
+#define DEBUG_MODE 0
-#if DEBUG_TREE
+#if DEBUG_MODE
#define TREE_WIDTH 365
#else
#define TREE_WIDTH 265
@@ -113,21 +110,15 @@
struct Current_State
{
- // Engrave_File *ef;
- Engrave_Group *eg;
- Engrave_Part *ep;
- Engrave_Program *epr;
- Engrave_Part_State *eps;
char *open_file_name; //Full path to the open edje file
char *source_dir; //Full path to sources
char *main_source_file; //Full path to the main edc file
- Etk_String *group;
- Etk_String *part;
- Etk_String *state;
- Etk_String *prog;
- Etk_String *tween;
-
+ Etk_String *group; //The current selected group name
+ Etk_String *part; //The current selected part name
+ Etk_String *state; //The current selected state name
+ Etk_String *prog; //The current selected prog name
+ Etk_String *tween; //The current selected tween name
Etk_String *edj_file_name;
Etk_String *edj_temp_name;
@@ -139,9 +130,6 @@
char *EdjeFile; //The filename of the edje_editor.edj
file (witch contain all the graphics used by the program)
Evas_Object *edje_o; //The edje object we are editing
Evas_Hash *Parts_Hash; //Associate part names with
Etk_Tree_Row*
-Ecore_Hash *hash; //Associate the engrave objects with
the tree_rows
-
-Evas_Object *engrave_canvas; //The engrave canvas
Evas_Object *EV_fakewin; //The simple window implementation
Evas_Object *EV_movebox; // FIXME
@@ -152,6 +140,9 @@
Evas_Object *rel1Y_parent_handler; //
Evas_Object *rel2X_parent_handler; //
Evas_Object *rel2Y_parent_handler; //
+Evas_Object *Consolle; //The lower consolle panel
+Evas_List *stack; //Stack for the consolle
+int consolle_count; //Counter for the consolle
/* FUNCTION PROTOTYPES*/
void DebugInfo(int full);
@@ -199,5 +190,10 @@
#define EDJE_TWEEN_MODE_ACCELERATE 3
#define EDJE_TWEEN_MODE_DECELERATE 4
#define EDJE_TWEEN_MODE_LAST 5
+
+#define EDJE_ASPECT_PREFER_NONE 0
+#define EDJE_ASPECT_PREFER_VERTICAL 1
+#define EDJE_ASPECT_PREFER_HORIZONTAL 2
+#define EDJE_ASPECT_PREFER_BOTH 3
#endif // INCLUSION_GUARD
-------------------------------------------------------------------------
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
