Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_consolle.c edje_editor_images.c edje_editor_part.c
edje_editor_part.h edje_editor_position.c
edje_editor_program.c edje_editor_rect.c edje_editor_script.c
edje_editor_text.c edje_editor_toolbar.c edje_editor_tree.c
edje_editor_window.c edje_editor_window.h main.c
Log Message:
cleans & renames of edje_editor_window.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_consolle.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_consolle.c 2 Jul 2008 02:48:58 -0000 1.2
+++ edje_editor_consolle.c 2 Jul 2008 17:27:02 -0000 1.3
@@ -126,7 +126,7 @@
//Embed Signal Emit
embed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(embed), _create_signal_embed());
- etk_embed_position_method_set(ETK_EMBED(embed), _embed_position_set,
+ etk_embed_position_method_set(ETK_EMBED(embed), window_embed_position_set,
UI_ecore_MainWin);
etk_widget_show_all(embed);
edje_object_part_swallow(EV_Consolle,"signal_swallow",
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_images.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_images.c 2 Jul 2008 14:29:34 -0000 1.3
+++ edje_editor_images.c 2 Jul 2008 17:27:02 -0000 1.4
@@ -33,7 +33,7 @@
UI_AddTweenButton = etk_button_new_from_stock(ETK_STOCK_LIST_ADD);
etk_button_style_set(ETK_BUTTON(UI_AddTweenButton), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(UI_AddTweenButton),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_ADD);
+ ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_ADD);
etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_AddTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -41,7 +41,7 @@
UI_DeleteTweenButton = etk_button_new_from_stock(ETK_STOCK_LIST_REMOVE);
etk_button_style_set(ETK_BUTTON(UI_DeleteTweenButton), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(UI_DeleteTweenButton),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_DELETE);
+ ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_DELETE);
etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_DeleteTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -49,7 +49,7 @@
UI_MoveUpTweenButton = etk_button_new_from_stock(ETK_STOCK_GO_UP);
etk_button_style_set(ETK_BUTTON(UI_MoveUpTweenButton), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(UI_MoveUpTweenButton),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_UP);
+ ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_UP);
etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_MoveUpTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -57,7 +57,7 @@
UI_MoveDownTweenButton = etk_button_new_from_stock(ETK_STOCK_GO_DOWN);
etk_button_style_set(ETK_BUTTON(UI_MoveDownTweenButton), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(UI_MoveDownTweenButton),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_DOWN);
+ ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_DOWN);
etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_MoveDownTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -122,7 +122,7 @@
etk_signal_connect("row-selected", ETK_OBJECT(UI_ImageTweenList),
ETK_CALLBACK(_image_TweenList_row_selected_cb), NULL);
etk_signal_connect("clicked", ETK_OBJECT(UI_ImageAddButton),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_BROWSER_SHOW);
+ ETK_CALLBACK(_window_all_button_click_cb),
(void*)IMAGE_BROWSER_SHOW);
etk_signal_connect("value-changed", ETK_OBJECT(UI_ImageAlphaSlider),
ETK_CALLBACK(_image_AlphaSlider_value_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_BorderLeftSpinner),
@@ -280,7 +280,7 @@
etk_object_properties_set(ETK_OBJECT(button), "label","Import image",NULL);
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_BOTH_VERT);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_IMAGE_FILE_ADD);
+ ETK_CALLBACK(_window_all_button_click_cb),
(void*)TOOLBAR_IMAGE_FILE_ADD);
etk_box_append(ETK_BOX(vbox), button, 0, ETK_BOX_NONE, 0);
//DeleteImageButton
@@ -329,7 +329,7 @@
button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CLOSE);
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_BOTH_VERT);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_BROWSER_CLOSE);
+ ETK_CALLBACK(_window_all_button_click_cb),
(void*)IMAGE_BROWSER_CLOSE);
etk_box_append(ETK_BOX(vbox), button, 0, ETK_BOX_NONE, 0);
return UI_ImageBrowserWin;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_editor_part.c 2 Jul 2008 15:48:11 -0000 1.6
+++ edje_editor_part.c 2 Jul 2008 17:27:02 -0000 1.7
@@ -4,6 +4,8 @@
#include <Edje_Edit.h>
#include "main.h"
+
+
/*** Implementation ***/
Etk_Widget*
part_frame_create(void)
@@ -189,6 +191,30 @@
}
+char*
+part_type_image_get(int part_type)
+{
+ /* Get the name of the group in edje_editor.edj that
+ * correspond to the given EDJE_PART_TYPE.
+ * Remember to free the returned string.
+ */
+
+ static char buf[20];
+ char *ret;
+
+ switch (part_type)
+ {
+ 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;
+ case EDJE_PART_TYPE_GROUP: strcpy(buf,"GROUP.PNG"); break;
+ default: strcpy(buf,"NONE.PNG"); break;
+ }
+ ret = strdup(buf);
+ printf("IMAGE: %s\n",ret);
+ return ret;
+}
/*** Callbacks ***/
Etk_Bool
_part_EventsCheck_toggled_cb(Etk_Object *object, void *data)
@@ -298,7 +324,7 @@
//Update PartTree
row = etk_tree_selected_row_get(ETK_TREE(UI_PartsTree));
- image_name = GetPartTypeImage(edje_edit_part_type_get(edje_o,
Cur.part->string));
+ image_name = part_type_image_get(edje_edit_part_type_get(edje_o,
Cur.part->string));
etk_tree_row_fields_set(row,TRUE,
COL_NAME, EdjeFile, image_name, name, NULL);
free(image_name);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_part.h 2 Jul 2008 15:01:49 -0000 1.2
+++ edje_editor_part.h 2 Jul 2008 17:27:02 -0000 1.3
@@ -13,8 +13,10 @@
Etk_Widget *UI_PartSourceLabel;
-Etk_Widget* part_frame_create (void);
-void part_frame_update (void);
+Etk_Widget* part_frame_create (void);
+void part_frame_update (void);
+char* part_type_image_get (int part_type);
+
Etk_Bool _part_EventsCheck_toggled_cb (Etk_Object *object, void
*data);
Etk_Bool _part_EventsRepeatCheck_toggled_cb (Etk_Object *object, void
*data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_position.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_position.c 2 Jul 2008 15:22:38 -0000 1.5
+++ edje_editor_position.c 2 Jul 2008 17:27:02 -0000 1.6
@@ -362,7 +362,7 @@
{
//printf("-- %s\n", (char *)l->data);
type = edje_edit_part_type_get(edje_o,(char *)l->data);
- image_name = GetPartTypeImage(type);
+ image_name = part_type_image_get(type);
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox),
etk_image_new_from_edje(EdjeFile,
image_name),
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_program.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_program.c 2 Jul 2008 15:48:11 -0000 1.5
+++ edje_editor_program.c 2 Jul 2008 17:27:02 -0000 1.6
@@ -36,7 +36,7 @@
etk_table_attach_default(ETK_TABLE(table),UI_RunProgButton, 3, 3, 0, 0);
etk_signal_connect("clicked", ETK_OBJECT(UI_RunProgButton),
- ETK_CALLBACK(on_AllButton_click), (void*)RUN_PROG);
+ ETK_CALLBACK(_window_all_button_click_cb), (void*)RUN_PROG);
//UI_SourceEntry
label = etk_label_new("<b>Source</b>");
@@ -414,7 +414,7 @@
l = edje_edit_parts_list_get(edje_o);
while (l)
{
- image_name = GetPartTypeImage(edje_edit_part_type_get(edje_o,
(char*)l->data));
+ image_name = part_type_image_get(edje_edit_part_type_get(edje_o,
(char*)l->data));
etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
etk_image_new_from_edje(EdjeFile, image_name),
(char *)l->data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_rect.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_rect.c 2 Jul 2008 15:55:41 -0000 1.3
+++ edje_editor_rect.c 2 Jul 2008 17:27:02 -0000 1.4
@@ -7,7 +7,7 @@
Etk_Widget*
rectangle_frame_create(Evas *evas)
{
- return create_a_color_button("Color", COLOR_OBJECT_RECT, 100, 30, evas);
+ return window_color_button_create("Color", COLOR_OBJECT_RECT, 100, 30,
evas);
}
void
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_script.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_script.c 2 Jul 2008 15:58:27 -0000 1.2
+++ edje_editor_script.c 2 Jul 2008 17:27:02 -0000 1.3
@@ -29,7 +29,7 @@
ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect("clicked", ETK_OBJECT(UI_ScriptSaveButton),
- ETK_CALLBACK(on_AllButton_click), (void*)SAVE_SCRIPT);
+ ETK_CALLBACK(_window_all_button_click_cb), (void*)SAVE_SCRIPT);
return vbox;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_text.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_text.c 2 Jul 2008 16:31:19 -0000 1.3
+++ edje_editor_text.c 2 Jul 2008 17:27:02 -0000 1.4
@@ -126,15 +126,15 @@
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Color buttons
- etk_box_append(ETK_BOX(hbox),
create_a_color_button("Text",COLOR_OBJECT_TEXT,30,30, evas),
+ etk_box_append(ETK_BOX(hbox),
window_color_button_create("Text",COLOR_OBJECT_TEXT,30,30, evas),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_box_append(ETK_BOX(hbox),
create_a_color_button("Shadow",COLOR_OBJECT_SHADOW,30,30, evas),
+ etk_box_append(ETK_BOX(hbox),
window_color_button_create("Shadow",COLOR_OBJECT_SHADOW,30,30, evas),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_box_append(ETK_BOX(hbox),
create_a_color_button("Outline",COLOR_OBJECT_OUTLINE,30,30, evas),
+ etk_box_append(ETK_BOX(hbox),
window_color_button_create("Outline",COLOR_OBJECT_OUTLINE,30,30, evas),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
etk_signal_connect("clicked", ETK_OBJECT(UI_FontAddButton),
- ETK_CALLBACK(on_AllButton_click),
+ ETK_CALLBACK(_window_all_button_click_cb),
(void*)TOOLBAR_FONT_FILE_ADD);
etk_signal_connect("item-activated", ETK_OBJECT(UI_FontComboBox),
ETK_CALLBACK(_text_FontComboBox_item_activated_cb),
NULL);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_editor_toolbar.c 2 Jul 2008 16:55:45 -0000 1.7
+++ edje_editor_toolbar.c 2 Jul 2008 17:27:02 -0000 1.8
@@ -24,27 +24,31 @@
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_NEW);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_NEW);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_NEW);
//OpenButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_OPEN);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPEN);
//SaveButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
etk_object_properties_set(ETK_OBJECT(button),"label","Save",NULL);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_SAVE);
//SaveEDJButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE_AS);
etk_object_properties_set(ETK_OBJECT(button),"label","Save as",NULL);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click),
(void*)TOOLBAR_SAVE_EDJ);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_SAVE_EDJ);
//SaveEDCButton
/* button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE_AS);
@@ -60,7 +64,8 @@
//AddButton
button = etk_tool_button_new_from_stock(ETK_STOCK_LIST_ADD);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_ADD);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_ADD);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
//AddMenu
@@ -145,7 +150,8 @@
//RemoveButton
button = etk_tool_button_new_from_stock(ETK_STOCK_LIST_REMOVE);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_REMOVE);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_REMOVE);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
//RemoveMenu
@@ -192,14 +198,16 @@
button = etk_tool_button_new_from_stock( ETK_STOCK_GO_UP);
etk_object_properties_set(ETK_OBJECT(button),"label","Lower",NULL);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_MOVE_UP);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_MOVE_UP);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
//MoveDown Button
button = etk_tool_button_new_from_stock( ETK_STOCK_GO_DOWN);
etk_object_properties_set(ETK_OBJECT(button),"label","Raise",NULL);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_MOVE_DOWN);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_MOVE_DOWN);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
sep = etk_vseparator_new();
@@ -209,7 +217,8 @@
button = etk_tool_button_new_from_stock( ETK_STOCK_IMAGE_X_GENERIC);
etk_object_properties_set(ETK_OBJECT(button),"label","Images",NULL);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click),
(void*)TOOLBAR_IMAGE_BROWSER);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_IMAGE_BROWSER);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
#if DEBUG_MODE
@@ -217,7 +226,8 @@
button = etk_tool_button_new_from_stock(
ETK_STOCK_PREFERENCES_DESKTOP_FONT);
etk_object_properties_set(ETK_OBJECT(button),"label","Fonts",NULL);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click),
(void*)TOOLBAR_FONT_BROWSER);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_FONT_BROWSER);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
#endif
@@ -228,7 +238,8 @@
button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM);
etk_object_properties_set(ETK_OBJECT(button),"label","Options",NULL);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_OPTIONS);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTIONS);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
//OptionsMenu
@@ -239,7 +250,8 @@
image = etk_image_new_from_edje(EdjeFile,"BG1_I.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_AllButton_click), (void*)TOOLBAR_OPTION_BG1);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_BG1);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
//set bg2
@@ -247,7 +259,8 @@
image = etk_image_new_from_edje(EdjeFile,"BG2_I.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_AllButton_click), (void*)TOOLBAR_OPTION_BG2);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_BG2);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
//set bg3
@@ -255,7 +268,8 @@
image = etk_image_new_from_edje(EdjeFile,"BG3_I.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_AllButton_click), (void*)TOOLBAR_OPTION_BG3);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_BG3);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
//set bg4
@@ -263,7 +277,8 @@
image = etk_image_new_from_edje(EdjeFile,"BG4_I.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_AllButton_click), (void*)TOOLBAR_OPTION_BG4);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_BG4);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
//Separator
@@ -275,7 +290,8 @@
image = etk_image_new_from_stock(ETK_STOCK_VIDEO_DISPLAY, ETK_STOCK_SMALL);
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_AllButton_click),
(void*)TOOLBAR_OPTION_FULLSCREEN);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_FULLSCREEN);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
sep = etk_vseparator_new();
@@ -289,7 +305,8 @@
etk_object_properties_set(ETK_OBJECT(UI_PlayButton),"label","Pause
Edje",NULL);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), UI_PlayButton, ETK_BOX_START);
etk_signal_connect("clicked", ETK_OBJECT(UI_PlayButton),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_PLAY);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_PLAY);
#if DEBUG_MODE
//Separator
@@ -309,7 +326,8 @@
etk_object_properties_set(ETK_OBJECT(button),"label","Quit",NULL);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_QUIT);
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_QUIT);
return UI_Toolbar;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_editor_tree.c 2 Jul 2008 16:55:45 -0000 1.11
+++ edje_editor_tree.c 2 Jul 2008 17:27:02 -0000 1.12
@@ -161,7 +161,7 @@
}
/* Add the row in the right position */
- buf = GetPartTypeImage(edje_edit_part_type_get(edje_o, part_name));
+ buf = part_type_image_get(edje_edit_part_type_get(edje_o, part_name));
if ((int)after > 1)
row = etk_tree_row_insert(ETK_TREE(UI_PartsTree),
NULL,
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_editor_window.c 2 Jul 2008 16:55:45 -0000 1.15
+++ edje_editor_window.c 2 Jul 2008 17:27:02 -0000 1.16
@@ -6,102 +6,9 @@
#include "main.h"
-
-
-char*
-GetPartTypeImage(int part_type)
-{
- /* Get the name of the group in edje_editor.edj that
- * correspond to the given EDJE_PART_TYPE.
- * Remember to free the returned string.
- */
-
- static char buf[20];
- char *ret;
-
- switch (part_type)
- {
- 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;
- case EDJE_PART_TYPE_GROUP: strcpy(buf,"GROUP.PNG"); break;
- default: strcpy(buf,"NONE.PNG"); break;
- }
- ret = strdup(buf);
- printf("IMAGE: %s\n",ret);
- return ret;
-}
-
-Etk_Widget*
-create_a_color_button(char* label_text, int color_button_enum,int w,int h,
Evas *evas)
-{
- Etk_Widget *vbox;
- Etk_Widget *label;
- Etk_Widget *shadow;
- Evas_Object* rect;
- Etk_Widget *etk_evas_object;
-
- //vbox
- vbox = etk_vbox_new(ETK_FALSE, 3);
-
- //shadow
- shadow = etk_shadow_new();
- etk_shadow_border_set(ETK_SHADOW(shadow), 0);
- //etk_widget_size_request_set(shadow, 45, 45);
- etk_shadow_shadow_set(ETK_SHADOW(shadow),ETK_SHADOW_OUTSIDE,
ETK_SHADOW_ALL, 10, 2, 2, 200);
- //etk_shadow_shadow_set(Etk_Shadow *shadow, Etk_Shadow_Type type,
Etk_Shadow_Edges edges, int radius, int offset_x, int offset_y, int opacity);
- etk_box_append(ETK_BOX(vbox), shadow, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
-
- //Add the colored rectangle
- rect = evas_object_rectangle_add(evas);
- evas_object_color_set(rect, 255,100,100,255);
- evas_object_resize(rect, w, h);
- etk_evas_object = etk_evas_object_new();
- etk_evas_object_set_object(ETK_EVAS_OBJECT(etk_evas_object), rect);
- evas_object_show(rect);
- etk_widget_show_all(etk_evas_object);
- evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN,
- on_ColorCanvas_click,
(void*)color_button_enum);
- etk_container_add(ETK_CONTAINER(shadow), etk_evas_object);
- etk_widget_size_request_set(etk_evas_object, w, h);
- switch (color_button_enum)
- {
- case COLOR_OBJECT_RECT:
- RectColorObject = rect;
- break;
- case COLOR_OBJECT_TEXT:
- TextColorObject = rect;
- break;
- case COLOR_OBJECT_SHADOW:
- ShadowColorObject = rect;
- break;
- case COLOR_OBJECT_OUTLINE:
- OutlineColorObject = rect;
- break;
- }
-
- //Label
- if (label_text){
- label = etk_label_new(label_text);
- etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
- }
- return vbox;
-}
-
-
-
-
-
-void
-_embed_position_set(void *position_data, int *x, int *y)
-{
- ecore_evas_geometry_get(position_data, x, y, NULL, NULL);
-}
-
+/*** Implementation ***/
void
-create_main_window(void)
+window_main_create(void)
{
//Create the main ecore_evas window
#if USE_GL_ENGINE
@@ -110,8 +17,8 @@
UI_ecore_MainWin = ecore_evas_software_x11_new(NULL, 0, 0, 0, 32, 32);
#endif
ecore_evas_title_set(UI_ecore_MainWin, "Edje Editor");
- ecore_evas_callback_resize_set(UI_ecore_MainWin, ecore_resize_callback);
- ecore_evas_callback_delete_request_set(UI_ecore_MainWin, ecore_delete_cb);
+ ecore_evas_callback_resize_set(UI_ecore_MainWin, _window_resize_cb);
+ ecore_evas_callback_delete_request_set(UI_ecore_MainWin, _window_delete_cb);
ecore_evas_resize(UI_ecore_MainWin, 950, 500);
ecore_evas_size_min_set(UI_ecore_MainWin, 600, 350);
UI_evas = ecore_evas_get(UI_ecore_MainWin);
@@ -131,7 +38,7 @@
logo = edje_object_add(UI_evas);
edje_object_file_set(logo, EdjeFile, "Logo");
evas_object_event_callback_add(logo, EVAS_CALLBACK_KEY_DOWN,
- on_Mainwin_key_press, NULL);
+ _window_logo_key_press, NULL);
Evas_Modifier_Mask mask;
mask = evas_key_modifier_mask_get(UI_evas, "Control");
evas_object_key_grab(logo, "q", mask, 0, 0); // quit
@@ -152,7 +59,7 @@
etk_container_add(ETK_CONTAINER(UI_ToolbarEmbed),
toolbar_create(ETK_TOOLBAR_HORIZ));
etk_embed_position_method_set(ETK_EMBED(UI_ToolbarEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_ToolbarEmbed);
evas_object_move(etk_embed_object_get(ETK_EMBED(UI_ToolbarEmbed)), 130, 0);
evas_object_resize(etk_embed_object_get(ETK_EMBED(UI_ToolbarEmbed)), 0, 50);
@@ -161,14 +68,14 @@
UI_PartsTreeEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_PartsTreeEmbed), tree_create());
etk_embed_position_method_set(ETK_EMBED(UI_PartsTreeEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_PartsTreeEmbed);
//GroupEmbed
UI_GroupEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_GroupEmbed), group_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_GroupEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_GroupEmbed);
edje_object_part_swallow(edje_ui,"group_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_GroupEmbed)));
@@ -177,7 +84,7 @@
UI_PartEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_PartEmbed), part_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_PartEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_PartEmbed);
edje_object_part_swallow(edje_ui,"part_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_PartEmbed)));
@@ -186,7 +93,7 @@
UI_DescriptionEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_DescriptionEmbed), state_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_DescriptionEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_DescriptionEmbed);
edje_object_part_swallow(edje_ui,"description_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_DescriptionEmbed)));
@@ -195,7 +102,7 @@
UI_RectEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_RectEmbed),
rectangle_frame_create(UI_evas));
etk_embed_position_method_set(ETK_EMBED(UI_RectEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_RectEmbed);
edje_object_part_swallow(edje_ui,"rect_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_RectEmbed)));
@@ -204,7 +111,7 @@
UI_TextEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_TextEmbed), text_frame_create(UI_evas));
etk_embed_position_method_set(ETK_EMBED(UI_TextEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_TextEmbed);
edje_object_part_swallow(edje_ui,"text_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_TextEmbed)));
@@ -213,7 +120,7 @@
UI_ImageEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_ImageEmbed), image_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_ImageEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_ImageEmbed);
edje_object_part_swallow(edje_ui,"image_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_ImageEmbed)));
@@ -222,7 +129,7 @@
UI_PositionEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_PositionEmbed), position_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_PositionEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_PositionEmbed);
edje_object_part_swallow(edje_ui,"position_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_PositionEmbed)));
@@ -231,7 +138,7 @@
UI_ProgramEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_ProgramEmbed), program_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_ProgramEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_ProgramEmbed);
edje_object_part_swallow(edje_ui,"program_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_ProgramEmbed)));
@@ -240,7 +147,7 @@
UI_ScriptEmbed = etk_embed_new(UI_evas);
etk_container_add(ETK_CONTAINER(UI_ScriptEmbed), script_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_ScriptEmbed),
- _embed_position_set, UI_ecore_MainWin);
+ window_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_ScriptEmbed);
edje_object_part_swallow(edje_ui,"script_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_ScriptEmbed)));
@@ -263,22 +170,86 @@
//Create the main edje object to edit
edje_o = edje_object_add(UI_evas);
- edje_object_signal_callback_add(edje_o, "*", "*", signal_cb, NULL);
+ edje_object_signal_callback_add(edje_o, "*", "*",
+ _window_edit_obj_signal_cb, NULL);
evas_object_event_callback_add(edje_o, EVAS_CALLBACK_MOUSE_DOWN,
- on_Editing_click, NULL);
+ _window_edit_obj_click, NULL);
+}
+
+Etk_Widget*
+window_color_button_create(char* label_text, int color_button_enum,int w,int
h, Evas *evas)
+{
+ Etk_Widget *vbox;
+ Etk_Widget *label;
+ Etk_Widget *shadow;
+ Evas_Object* rect;
+ Etk_Widget *etk_evas_object;
+
+ //vbox
+ vbox = etk_vbox_new(ETK_FALSE, 3);
+
+ //shadow
+ shadow = etk_shadow_new();
+ etk_shadow_border_set(ETK_SHADOW(shadow), 0);
+ //etk_widget_size_request_set(shadow, 45, 45);
+ etk_shadow_shadow_set(ETK_SHADOW(shadow),ETK_SHADOW_OUTSIDE,
ETK_SHADOW_ALL, 10, 2, 2, 200);
+ //etk_shadow_shadow_set(Etk_Shadow *shadow, Etk_Shadow_Type type,
Etk_Shadow_Edges edges, int radius, int offset_x, int offset_y, int opacity);
+ etk_box_append(ETK_BOX(vbox), shadow, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
+
+ //Add the colored rectangle
+ rect = evas_object_rectangle_add(evas);
+ evas_object_color_set(rect, 255,100,100,255);
+ evas_object_resize(rect, w, h);
+ etk_evas_object = etk_evas_object_new();
+ etk_evas_object_set_object(ETK_EVAS_OBJECT(etk_evas_object), rect);
+ evas_object_show(rect);
+ etk_widget_show_all(etk_evas_object);
+ evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN,
+ _window_color_canvas_click,
+ (void*)color_button_enum);
+ etk_container_add(ETK_CONTAINER(shadow), etk_evas_object);
+ etk_widget_size_request_set(etk_evas_object, w, h);
+ switch (color_button_enum)
+ {
+ case COLOR_OBJECT_RECT:
+ RectColorObject = rect;
+ break;
+ case COLOR_OBJECT_TEXT:
+ TextColorObject = rect;
+ break;
+ case COLOR_OBJECT_SHADOW:
+ ShadowColorObject = rect;
+ break;
+ case COLOR_OBJECT_OUTLINE:
+ OutlineColorObject = rect;
+ break;
+ }
+
+ //Label
+ if (label_text){
+ label = etk_label_new(label_text);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
+ }
+ return vbox;
+}
+
+void
+window_embed_position_set(void *position_data, int *x, int *y)
+{
+ ecore_evas_geometry_get(position_data, x, y, NULL, NULL);
}
-/* Called when the window is destroyed */
+/*** Callbacks ***/
void
-ecore_delete_cb(Ecore_Evas *ee)
+_window_delete_cb(Ecore_Evas *ee)
{
etk_main_quit();
}
-/* Called when the window is resized */
void
-ecore_resize_callback(Ecore_Evas *ecore_evas)
+_window_resize_cb(Ecore_Evas *ecore_evas)
{
Evas_Object *embed_object;
int win_w, win_h;
@@ -298,26 +269,35 @@
evas_object_move(EV_Consolle, TREE_WIDTH + 5, win_h - 105);
evas_object_resize(EV_Consolle, win_w - TREE_WIDTH - 10, 75);
}
-/* Catch all the signal from the editing edje object */
-void
-signal_cb(void *data, Evas_Object *o, const char *sig, const char *src)
+
+void
+_window_edit_obj_signal_cb(void *data, Evas_Object *o, const char *sig, const
char *src)
{
+ /* Catch all the signal from the editing edje object */
char buf[1024];
+
consolle_count++;
snprintf(buf, sizeof(buf), "[%d] SIGNAL = '%s' SOURCE = '%s'",
consolle_count, sig, src);
consolle_log(buf);
}
+void
+_window_edit_obj_click(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ int x, y;
+
+ evas_pointer_output_xy_get(e, &x, &y);
+
+ //o2 = evas_object_top_at_pointer_get(e);
+ //Evas_List *l = evas_objects_at_xy_get (e, ev->canvas.x, ev->canvas.y,
1, 1);
+ //printf("CLIK %x [%d %d] num: %d\n", obj, ev->canvas.x, ev->canvas.y,
evas_list_count(l));
+}
-
-
-
-
-/* All the buttons Callback */
Etk_Bool
-on_AllButton_click(Etk_Button *button, void *data)
+_window_all_button_click_cb(Etk_Button *button, void *data)
{
+ /* Unique callbacks for all the buttons in edje editor */
Etk_String *text;
const char *tween;
Etk_Tree_Row *row, *next, *prev;
@@ -532,19 +512,7 @@
}
void
-on_Editing_click(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
- int x, y;
-
- evas_pointer_output_xy_get(e, &x, &y);
-
- //o2 = evas_object_top_at_pointer_get(e);
- //Evas_List *l = evas_objects_at_xy_get (e, ev->canvas.x, ev->canvas.y,
1, 1);
- //printf("CLIK %x [%d %d] num: %d\n", obj, ev->canvas.x, ev->canvas.y,
evas_list_count(l));
-}
-
-void
-on_Mainwin_key_press(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_window_logo_key_press(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Key_Down *ev = event_info;
@@ -574,16 +542,11 @@
/* save (TODO make some sort of feedback for the user)*/
else if (!strcmp(ev->key, "s") &&
evas_key_modifier_is_set(ev->modifiers, "Control"))
- on_AllButton_click(NULL, (void *)TOOLBAR_SAVE);
-
-
+ _window_all_button_click_cb(NULL, (void *)TOOLBAR_SAVE);
}
-
-
-
void
-on_ColorCanvas_click(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_window_color_canvas_click(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
Etk_Color c;
printf("Clik Signal on ColorCanvas Emitted\n");
@@ -622,9 +585,4 @@
etk_signal_unblock("color-changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(_dialog_colorpicker_change_cb), NULL);
}
-
-
-
-
-
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_window.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_window.h 2 Jul 2008 17:27:02 -0000 1.2
@@ -1,12 +1,11 @@
#ifndef _EDJE_EDITOR_INTERFACE_H_
#define _EDJE_EDITOR_INTERFACE_H_
-#include "main.h"
-
-Evas *UI_evas;
-/* main window objects */
-Ecore_Evas *UI_ecore_MainWin;
+/* main windows objects */
+Evas *UI_evas;
+Ecore_Evas *UI_ecore_MainWin;
+Evas_Object *edje_ui;
/* etk_embed objects */
@@ -23,27 +22,19 @@
Etk_Widget *UI_ToolbarEmbed;
-Evas_Object *edje_ui;
-
-
-void create_main_window(void);
-
-void _embed_position_set(void *position_data, int *x, int *y);
-char* GetPartTypeImage(int part_type);
-Etk_Widget* create_a_color_button(char* label_text, int color_button_enum,int
w,int h, Evas *evas);
-
-
-/* Called when the window is destroyed */
-//Etk_Bool etk_main_quit_cb (void *data);
-void ecore_delete_cb (Ecore_Evas *ee);
-void ecore_resize_callback (Ecore_Evas *ecore_evas);
-
-Etk_Bool on_canvas_geometry_changed (Etk_Object *canvas, const char
*property_name, void *data);
-void on_ColorCanvas_click (void *data, Evas *e, Evas_Object
*obj, void *event_info);
-Etk_Bool on_AllButton_click (Etk_Button *button, void *data);
-void on_Mainwin_key_press (void *data, Evas *e, Evas_Object
*obj, void *event_info);
-void on_Editing_click (void *data, Evas *e, Evas_Object
*obj, void *event_info);
+void window_main_create (void);
+Etk_Widget* window_color_button_create (char* label_text, int
color_button_enum,int w,int h, Evas *evas);
+void window_embed_position_set (void *position_data, int *x, int *y);
+
+void _window_delete_cb (Ecore_Evas *ee);
+void _window_resize_cb (Ecore_Evas *ecore_evas);
+
+void _window_edit_obj_signal_cb (void *data, Evas_Object *o, const char
*sig, const char *src);
+void _window_edit_obj_click (void *data, Evas *e, Evas_Object *obj,
void *event_info);
+
+Etk_Bool _window_all_button_click_cb (Etk_Button *button, void *data);
+void _window_logo_key_press (void *data, Evas *e, Evas_Object *obj,
void *event_info);
+void _window_color_canvas_click (void *data, Evas *e, Evas_Object *obj,
void *event_info);
-void signal_cb(void *data, Evas_Object *o, const char *sig, const char *src);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- main.c 2 Jul 2008 16:55:45 -0000 1.52
+++ main.c 2 Jul 2008 17:27:02 -0000 1.53
@@ -349,7 +349,7 @@
//printf("%f\n", val);
//Create the etk window and all the widgets
- create_main_window();
+ window_main_create();
//Open a file from command line
if (argc == 2)
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
