Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_toolbar.c edje_editor_toolbar.h
edje_editor_window.c main.c
Log Message:
cleans & renames of edje_editor_toolbar.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_toolbar.c 2 Jul 2008 15:48:11 -0000 1.5
+++ edje_editor_toolbar.c 2 Jul 2008 16:42:31 -0000 1.6
@@ -5,9 +5,9 @@
#include "main.h"
-
+/*** Implementation ***/
Etk_Widget*
-create_toolbar(Etk_Toolbar_Orientation o)
+toolbar_create(Etk_Toolbar_Orientation o)
{
Etk_Widget *button;
Etk_Widget *sep;
@@ -71,7 +71,8 @@
image = etk_image_new_from_edje(EdjeFile,"RECT.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_RECT);
+ ETK_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*)NEW_RECT);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//New Image
@@ -79,7 +80,8 @@
image = etk_image_new_from_edje(EdjeFile,"IMAGE.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_IMAGE);
+ ETK_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*) NEW_IMAGE);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//New Text
@@ -87,7 +89,8 @@
image = etk_image_new_from_edje(EdjeFile,"TEXT.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_TEXT);
+ ETK_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*)NEW_TEXT);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//New Swallow
@@ -95,7 +98,8 @@
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_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*)NEW_SWAL);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//New GroupSwallow
@@ -103,7 +107,8 @@
image = etk_image_new_from_edje(EdjeFile,"GROUP.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_GROUPSWAL);
+ ETK_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*)NEW_GROUPSWAL);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//New Program
@@ -111,7 +116,8 @@
image = etk_image_new_from_edje(EdjeFile,"PROG.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_PROG);
+ ETK_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*)NEW_PROG);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//Separator
@@ -123,7 +129,8 @@
image = etk_image_new_from_edje(EdjeFile,"DESC.PNG");
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(UI_AddStateButton),
ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(UI_AddStateButton),
- ETK_CALLBACK(on_AddMenu_item_activated), (void*)NEW_DESC);
+ ETK_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*)NEW_DESC);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu),
ETK_MENU_ITEM(UI_AddStateButton));
//New Group
@@ -131,7 +138,8 @@
image = etk_image_new_from_edje(EdjeFile,"NONE.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_GROUP);
+ ETK_CALLBACK(_toolbar_add_menu_item_activated_cb),
+ (void*)NEW_GROUP);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
//RemoveButton
@@ -148,13 +156,15 @@
image = etk_image_new_from_edje(EdjeFile,"DESC.PNG");
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(UI_RemoveStateButton),
ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(UI_RemoveStateButton),
- ETK_CALLBACK(on_RemoveMenu_item_activated),
(void*)REMOVE_DESCRIPTION);
+ ETK_CALLBACK(_toolbar_remove_menu_item_activated_cb),
+ (void*)REMOVE_DESCRIPTION);
etk_menu_shell_append(ETK_MENU_SHELL(UI_RemoveMenu),
ETK_MENU_ITEM(UI_RemoveStateButton));
//part
UI_RemovePartButton = etk_menu_item_image_new_with_label("Selected Part");
etk_signal_connect("activated", ETK_OBJECT(UI_RemovePartButton),
- ETK_CALLBACK(on_RemoveMenu_item_activated), (void*)REMOVE_PART);
+ ETK_CALLBACK(_toolbar_remove_menu_item_activated_cb),
+ (void*)REMOVE_PART);
etk_menu_shell_append(ETK_MENU_SHELL(UI_RemoveMenu),
ETK_MENU_ITEM(UI_RemovePartButton));
//program
@@ -162,7 +172,8 @@
image = etk_image_new_from_edje(EdjeFile,"PROG.PNG");
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(UI_RemoveProgramButton),
ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(UI_RemoveProgramButton),
- ETK_CALLBACK(on_RemoveMenu_item_activated), (void*)REMOVE_PROG);
+ ETK_CALLBACK(_toolbar_remove_menu_item_activated_cb),
+ (void*)REMOVE_PROG);
etk_menu_shell_append(ETK_MENU_SHELL(UI_RemoveMenu),
ETK_MENU_ITEM(UI_RemoveProgramButton));
sep = etk_vseparator_new();
@@ -173,7 +184,8 @@
image = etk_image_new_from_edje(EdjeFile,"NONE.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_RemoveMenu_item_activated),
(void*)REMOVE_GROUP);
+ ETK_CALLBACK(_toolbar_remove_menu_item_activated_cb),
+ (void*)REMOVE_GROUP);
etk_menu_shell_append(ETK_MENU_SHELL(UI_RemoveMenu),
ETK_MENU_ITEM(menu_item));
//MoveUp Button
@@ -303,7 +315,7 @@
}
void
-TogglePlayButton(int set)
+toolbar_play_button_toggle(int set)
{
/* set -1 = toggle 0 = pause 1 = play */
if (set == -1)
@@ -323,9 +335,10 @@
}
}
+
/* Add/Remove Buttons Callbacks */
Etk_Bool
-on_AddMenu_item_activated(Etk_Object *object, void *data)
+_toolbar_add_menu_item_activated_cb(Etk_Object *object, void *data)
{
printf("Item Activated Signal on AddMenu EMITTED\n");
Etk_Tree_Row *row;
@@ -559,7 +572,7 @@
}
Etk_Bool
-on_RemoveMenu_item_activated(Etk_Object *object, void *data)
+_toolbar_remove_menu_item_activated_cb(Etk_Object *object, void *data)
{
Etk_Tree_Row *row, *next;
printf("Item Activated Signal on RemoveMenu EMITTED\n");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_toolbar.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_toolbar.h 2 Jul 2008 16:42:31 -0000 1.2
@@ -18,11 +18,11 @@
Etk_Widget *UI_RemoveProgramButton;
-Etk_Widget* create_toolbar(Etk_Toolbar_Orientation o);
-void TogglePlayButton(int set);
+Etk_Widget* toolbar_create (Etk_Toolbar_Orientation o);
+void toolbar_play_button_toggle (int set);
-Etk_Bool on_AddMenu_item_activated (Etk_Object *object, void *data);
-Etk_Bool on_RemoveMenu_item_activated (Etk_Object *object, void *data);
+Etk_Bool _toolbar_add_menu_item_activated_cb (Etk_Object *object, void
*data);
+Etk_Bool _toolbar_remove_menu_item_activated_cb (Etk_Object *object, void
*data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- edje_editor_window.c 2 Jul 2008 16:31:19 -0000 1.13
+++ edje_editor_window.c 2 Jul 2008 16:42:31 -0000 1.14
@@ -149,7 +149,8 @@
//ToolbarEmbed
UI_ToolbarEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_ToolbarEmbed),
create_toolbar(ETK_TOOLBAR_HORIZ));
+ 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);
etk_widget_show_all(UI_ToolbarEmbed);
@@ -498,7 +499,7 @@
ecore_evas_fullscreen_set(UI_ecore_MainWin, Cur.fullscreen);
break;
case TOOLBAR_PLAY:
- TogglePlayButton(-1);
+ toolbar_play_button_toggle(-1);
break;
case TOOLBAR_DEBUG:
//DebugInfo(FALSE);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- main.c 2 Jul 2008 16:31:19 -0000 1.50
+++ main.c 2 Jul 2008 16:42:31 -0000 1.51
@@ -134,7 +134,7 @@
if (Cur.group->string && !strcmp(group, Cur.group->string)) return;
printf("Change to group: %s\n", group);
- TogglePlayButton(1);
+ toolbar_play_button_toggle(1);
if (etk_string_length_get(Cur.group))
edje_edit_save(edje_o);
-------------------------------------------------------------------------
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
