Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_part.c edje_editor_part.h edje_editor_position.c
edje_editor_tree.c edje_editor_window.c main.c
Log Message:
cleans & renames of edje_editor_part.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_part.c 2 Jul 2008 14:08:41 -0000 1.3
+++ edje_editor_part.c 2 Jul 2008 15:01:49 -0000 1.4
@@ -4,9 +4,9 @@
#include <Edje_Edit.h>
#include "main.h"
-
+/*** Implementation ***/
Etk_Widget*
-create_part_frame(void)
+part_frame_create(void)
{
Etk_Widget *table;
Etk_Widget *label;
@@ -73,34 +73,34 @@
etk_signal_connect("text-changed", ETK_OBJECT(UI_PartNameEntry),
ETK_CALLBACK(_group_NamesEntry_text_changed_cb), NULL);
etk_signal_connect("key-down", ETK_OBJECT(UI_PartNameEntry),
- ETK_CALLBACK(on_PartNameEntry_key_down), NULL);
+ ETK_CALLBACK(_part_NameEntry_key_down_cb), NULL);
etk_signal_connect("mouse-click", ETK_OBJECT(UI_PartNameEntryImage),
- ETK_CALLBACK(on_PartNameEntryImage_mouse_clicked), NULL);
+ ETK_CALLBACK(_part_NameEntryImage_clicked_cb), NULL);
etk_signal_connect("toggled", ETK_OBJECT(UI_PartEventsCheck),
- ETK_CALLBACK(on_PartEventsCheck_toggled), NULL);
+ ETK_CALLBACK(_part_EventsCheck_toggled_cb), NULL);
etk_signal_connect("toggled", ETK_OBJECT(UI_PartEventsRepeatCheck),
- ETK_CALLBACK(on_PartEventsRepeatCheck_toggled), NULL);
+ ETK_CALLBACK(_part_EventsRepeatCheck_toggled_cb), NULL);
etk_signal_connect("item-activated", ETK_OBJECT(UI_CliptoComboBox),
- ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
+ ETK_CALLBACK(_part_CliptoComboBox_item_activated_cb),
NULL);
etk_signal_connect("item-activated", ETK_OBJECT(UI_PartSourceComboBox),
- ETK_CALLBACK(on_PartSourceComboBox_item_activated),
NULL);
+ ETK_CALLBACK(_part_SourceComboBox_item_activated_cb),
NULL);
return table;
}
void
-UpdatePartFrame(void)
+part_frame_update(void)
{
//Stop signal propagation
etk_signal_block("text-changed",ETK_OBJECT(UI_PartNameEntry),
_group_NamesEntry_text_changed_cb, NULL);
etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsCheck),
- on_PartEventsCheck_toggled, NULL);
+ _part_EventsCheck_toggled_cb, NULL);
etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
- on_PartEventsRepeatCheck_toggled, NULL);
+ _part_EventsRepeatCheck_toggled_cb, NULL);
etk_signal_block("item-activated", ETK_OBJECT(UI_CliptoComboBox),
- ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
+ ETK_CALLBACK(_part_CliptoComboBox_item_activated_cb),
NULL);
etk_signal_block("item-activated", ETK_OBJECT(UI_PartSourceComboBox),
- ETK_CALLBACK(on_PartSourceComboBox_item_activated), NULL);
+ ETK_CALLBACK(_part_SourceComboBox_item_activated_cb),
NULL);
if (etk_string_length_get(Cur.part))
{
@@ -178,19 +178,20 @@
etk_signal_unblock("text-changed",ETK_OBJECT(UI_PartNameEntry),
_group_NamesEntry_text_changed_cb, NULL);
etk_signal_unblock("toggled",ETK_OBJECT(UI_PartEventsCheck),
- on_PartEventsCheck_toggled, NULL);
+ _part_EventsCheck_toggled_cb, NULL);
etk_signal_unblock("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
- on_PartEventsRepeatCheck_toggled, NULL);
+ _part_EventsRepeatCheck_toggled_cb, NULL);
etk_signal_unblock("item-activated", ETK_OBJECT(UI_CliptoComboBox),
- ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
+ ETK_CALLBACK(_part_CliptoComboBox_item_activated_cb),
NULL);
etk_signal_unblock("item-activated", ETK_OBJECT(UI_PartSourceComboBox),
- ETK_CALLBACK(on_PartSourceComboBox_item_activated),
NULL);
-
+ ETK_CALLBACK(_part_SourceComboBox_item_activated_cb),
NULL);
}
+
+/*** Callbacks ***/
Etk_Bool
-on_PartEventsCheck_toggled(Etk_Object *object, void *data)
+_part_EventsCheck_toggled_cb(Etk_Object *object, void *data)
{
printf("Toggled Signal on EventsCheck EMITTED\n");
if (etk_string_length_get(Cur.part))
@@ -202,7 +203,7 @@
}
Etk_Bool
-on_PartEventsRepeatCheck_toggled(Etk_Object *object, void *data)
+_part_EventsRepeatCheck_toggled_cb(Etk_Object *object, void *data)
{
printf("Toggled Signal on EventsRepeatCheck EMITTED\n");
if (etk_string_length_get(Cur.part))
@@ -214,7 +215,7 @@
}
Etk_Bool
-on_CliptoComboBox_item_activated(Etk_Combobox *combobox, Etk_Combobox_Item
*item, void *data)
+_part_CliptoComboBox_item_activated_cb(Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data)
{
char *to;
printf("Item Activated Signal on CliptoCombobox EMITTED\n");
@@ -230,7 +231,7 @@
}
Etk_Bool
-on_PartSourceComboBox_item_activated(Etk_Combobox *combobox, Etk_Combobox_Item
*item, void *data)
+_part_SourceComboBox_item_activated_cb(Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data)
{
char *gr;
printf("Item Activated Signal on PartSourceCombobox EMITTED\n");
@@ -252,19 +253,21 @@
return ETK_TRUE;
}
+
Etk_Bool
-on_PartNameEntry_key_down(Etk_Object *object, Etk_Event_Key_Down *event, void
*data)
+_part_NameEntry_key_down_cb(Etk_Object *object, Etk_Event_Key_Down *event,
void *data)
{
printf("PRESSED %s\n", event->keyname);
if (!strcmp(event->keyname, "Return"))
- on_PartNameEntryImage_mouse_clicked(
+ _part_NameEntryImage_clicked_cb(
ETK_OBJECT(ETK_ENTRY(object)->secondary_image),
NULL);
return ETK_TRUE;
}
+
Etk_Bool
-on_PartNameEntryImage_mouse_clicked(Etk_Object *object, void *data)
+_part_NameEntryImage_clicked_cb(Etk_Object *object, void *data)
{
const char *name;
char *image_name;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_part.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_part.h 2 Jul 2008 15:01:49 -0000 1.2
@@ -2,7 +2,6 @@
#define _EDJE_EDITOR_PART_H_
-
/* part frame objects */
Etk_Widget *UI_PartNameEntry;
Etk_Widget *UI_PartNameEntryImage;
@@ -14,15 +13,15 @@
Etk_Widget *UI_PartSourceLabel;
-Etk_Widget *create_part_frame(void);
-void UpdatePartFrame(void);
+Etk_Widget* part_frame_create (void);
+void part_frame_update (void);
-Etk_Bool on_PartEventsCheck_toggled (Etk_Object *object, void *data);
-Etk_Bool on_PartEventsRepeatCheck_toggled (Etk_Object *object, void *data);
-Etk_Bool on_CliptoComboBox_item_activated (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
-Etk_Bool on_PartSourceComboBox_item_activated(Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
-Etk_Bool on_PartNameEntry_key_down (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
-Etk_Bool on_PartNameEntryImage_mouse_clicked(Etk_Object *object, void *data);
+Etk_Bool _part_EventsCheck_toggled_cb (Etk_Object *object, void
*data);
+Etk_Bool _part_EventsRepeatCheck_toggled_cb (Etk_Object *object, void
*data);
+Etk_Bool _part_CliptoComboBox_item_activated_cb (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
+Etk_Bool _part_SourceComboBox_item_activated_cb (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
+Etk_Bool _part_NameEntry_key_down_cb (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
+Etk_Bool _part_NameEntryImage_clicked_cb (Etk_Object *object, void
*data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_position.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_position.c 2 Jul 2008 13:50:01 -0000 1.3
+++ edje_editor_position.c 2 Jul 2008 15:01:49 -0000 1.4
@@ -222,11 +222,16 @@
printf("Populate 4 Rel Comboboxs\n");
//Stop signal propagation
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1X_SPINNER);
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1Y_SPINNER);
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2X_SPINNER);
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2Y_SPINNER);
- etk_signal_block("item-activated", ETK_OBJECT(UI_CliptoComboBox),
ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1X_SPINNER);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1Y_SPINNER);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2X_SPINNER);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2Y_SPINNER);
+ etk_signal_block("item-activated", ETK_OBJECT(UI_CliptoComboBox),
+ ETK_CALLBACK(_part_CliptoComboBox_item_activated_cb),
NULL);
etk_combobox_clear(ETK_COMBOBOX(UI_Rel1ToXComboBox));
@@ -287,11 +292,16 @@
}
//Reenable signal propagation
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1X_SPINNER);
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1Y_SPINNER);
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2X_SPINNER);
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2Y_SPINNER);
- etk_signal_unblock("item-activated", ETK_OBJECT(UI_CliptoComboBox),
ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1X_SPINNER);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1Y_SPINNER);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2X_SPINNER);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
+ ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2Y_SPINNER);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_CliptoComboBox),
+ ETK_CALLBACK(_part_CliptoComboBox_item_activated_cb),
NULL);
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_tree.c 2 Jul 2008 14:29:34 -0000 1.3
+++ edje_editor_tree.c 2 Jul 2008 15:01:49 -0000 1.4
@@ -108,7 +108,7 @@
etk_signal_block("item-activated",ETK_OBJECT(UI_GroupsComboBox),
on_GroupsComboBox_activated, NULL);
etk_signal_block("item-activated",ETK_OBJECT(UI_PartSourceComboBox),
- on_PartSourceComboBox_item_activated, NULL);
+ _part_SourceComboBox_item_activated_cb, NULL);
//Clear the combos
etk_combobox_clear(ETK_COMBOBOX(UI_GroupsComboBox));
@@ -128,7 +128,7 @@
etk_signal_unblock("item-activated",ETK_OBJECT(UI_GroupsComboBox),
on_GroupsComboBox_activated, NULL);
etk_signal_unblock("item-activated",ETK_OBJECT(UI_PartSourceComboBox),
- on_PartSourceComboBox_item_activated, NULL);
+ _part_SourceComboBox_item_activated_cb, NULL);
//Select the first group and load it
etk_combobox_active_item_set(ETK_COMBOBOX(UI_GroupsComboBox),
@@ -270,7 +270,7 @@
edje_object_signal_emit(edje_ui,"part_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"script_frame_hide","edje_editor");
- UpdatePartFrame();
+ part_frame_update();
break;
case ROW_DESC:
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_editor_window.c 2 Jul 2008 14:29:34 -0000 1.6
+++ edje_editor_window.c 2 Jul 2008 15:01:49 -0000 1.7
@@ -174,7 +174,7 @@
//PartEmbed
UI_PartEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_PartEmbed), create_part_frame());
+ 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);
etk_widget_show_all(UI_PartEmbed);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- main.c 2 Jul 2008 14:08:41 -0000 1.46
+++ main.c 2 Jul 2008 15:01:49 -0000 1.47
@@ -167,7 +167,7 @@
PopulateSignalComboEntry();
group_frame_update();
- UpdatePartFrame();
+ part_frame_update();
//update FakeWin title
edje_object_part_text_set(EV_fakewin, "title", group);
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
