Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_group.c edje_editor_group.h edje_editor_part.c
edje_editor_program.c edje_editor_state.c edje_editor_window.c
main.c
Log Message:
cleans & renames of edje_editor_group.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_group.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_group.c 2 Jul 2008 13:50:01 -0000 1.2
+++ edje_editor_group.c 2 Jul 2008 14:08:41 -0000 1.3
@@ -5,8 +5,9 @@
#include "main.h"
+/*** Implementation ***/
Etk_Widget*
-create_group_frame(void)
+group_frame_create(void)
{
Etk_Widget *label;
Etk_Widget *hbox, *vbox;
@@ -73,45 +74,45 @@
etk_signal_connect("text-changed", ETK_OBJECT(UI_GroupNameEntry),
- ETK_CALLBACK(on_NamesEntry_text_changed), NULL);
+ ETK_CALLBACK(_group_NamesEntry_text_changed_cb), NULL);
etk_signal_connect("key-down", ETK_OBJECT(UI_GroupNameEntry),
- ETK_CALLBACK(on_GroupNameEntry_key_down), NULL);
+ ETK_CALLBACK(_group_NameEntry_key_down_cb), NULL);
etk_signal_connect("mouse-click", ETK_OBJECT(UI_GroupNameEntryImage),
- ETK_CALLBACK(on_GroupNameEntryImage_mouse_clicked),
NULL);
+ ETK_CALLBACK(_group_NameEntryImage_clicked_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MINW_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_GroupMinHSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MINH_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MAXW_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MAXH_SPINNER);
return vbox;
}
void
-UpdateGroupFrame(void)
+group_frame_update(void)
{
//Stop signal propagation
etk_signal_block("text-changed", ETK_OBJECT(UI_GroupNameEntry),
- on_NamesEntry_text_changed, NULL);
+ _group_NamesEntry_text_changed_cb, NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MINW_SPINNER);
etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMinHSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MINH_SPINNER);
etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MAXW_SPINNER);
etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MAXH_SPINNER);
if (etk_string_length_get(Cur.group))
@@ -133,25 +134,26 @@
//ReEnable Signal Propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_GroupNameEntry),
- on_NamesEntry_text_changed, NULL);
+ _group_NamesEntry_text_changed_cb, NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinWSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MINW_SPINNER);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinHSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MINH_SPINNER);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MAXW_SPINNER);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner),
- ETK_CALLBACK(on_GroupSpinner_value_changed),
+ ETK_CALLBACK(_group_spinners_value_changed_cb),
(void *)MAXH_SPINNER);
}
+/*** Callbacks ***/
Etk_Bool
-on_NamesEntry_text_changed(Etk_Object *object, void *data)
+_group_NamesEntry_text_changed_cb(Etk_Object *object, void *data)
{
//printf("Text Changed Signal on one of the Names Entry Emitted\n");
etk_widget_show(ETK_WIDGET(ETK_ENTRY(object)->secondary_image));
@@ -159,7 +161,7 @@
}
Etk_Bool
-on_GroupSpinner_value_changed(Etk_Range *range, double value, void *data)
+_group_spinners_value_changed_cb(Etk_Range *range, double value, void *data)
{
printf("Group Spinners value changed signal EMIT\n");
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
@@ -184,20 +186,21 @@
}
return ETK_TRUE;
}
+
Etk_Bool
-on_GroupNameEntry_key_down(Etk_Object *object, Etk_Event_Key_Down *event, void
*data)
+_group_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_GroupNameEntryImage_mouse_clicked(
+ _group_NameEntryImage_clicked_cb(
ETK_OBJECT(ETK_ENTRY(object)->secondary_image),
NULL);
return ETK_TRUE;
}
Etk_Bool
-on_GroupNameEntryImage_mouse_clicked(Etk_Object *object, void *data)
+_group_NameEntryImage_clicked_cb(Etk_Object *object, void *data)
{
const char *name;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_group.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_group.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_group.h 2 Jul 2008 14:08:41 -0000 1.2
@@ -2,7 +2,6 @@
#define _EDJE_EDITOR_GROUP_H_
-/* group frame objects */
Etk_Widget *UI_GroupNameEntry;
Etk_Widget *UI_GroupNameEntryImage;
Etk_Widget *UI_GroupMinWSpinner;
@@ -12,12 +11,14 @@
Etk_Widget *UI_CurrentGroupSizeLabel;
-Etk_Widget* create_group_frame(void);
-void UpdateGroupFrame(void);
-Etk_Bool on_NamesEntry_text_changed (Etk_Object *object, void *data);
-Etk_Bool on_GroupSpinner_value_changed (Etk_Range *range, double value,
void *data);
-Etk_Bool on_GroupNameEntry_key_down (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
-Etk_Bool on_GroupNameEntryImage_mouse_clicked(Etk_Object *object, void *data);
+Etk_Widget* group_frame_create(void);
+void group_frame_update(void);
+
+
+Etk_Bool _group_NamesEntry_text_changed_cb (Etk_Object *object, void
*data);
+Etk_Bool _group_spinners_value_changed_cb (Etk_Range *range, double value,
void *data);
+Etk_Bool _group_NameEntry_key_down_cb (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
+Etk_Bool _group_NameEntryImage_clicked_cb (Etk_Object *object, void *data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_part.c 2 Jul 2008 13:50:01 -0000 1.2
+++ edje_editor_part.c 2 Jul 2008 14:08:41 -0000 1.3
@@ -71,7 +71,7 @@
etk_signal_connect("text-changed", ETK_OBJECT(UI_PartNameEntry),
- ETK_CALLBACK(on_NamesEntry_text_changed), NULL);
+ 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_signal_connect("mouse-click", ETK_OBJECT(UI_PartNameEntryImage),
@@ -92,7 +92,7 @@
{
//Stop signal propagation
etk_signal_block("text-changed",ETK_OBJECT(UI_PartNameEntry),
- on_NamesEntry_text_changed, NULL);
+ _group_NamesEntry_text_changed_cb, NULL);
etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsCheck),
on_PartEventsCheck_toggled, NULL);
etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
@@ -176,7 +176,7 @@
//ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_PartNameEntry),
- on_NamesEntry_text_changed, NULL);
+ _group_NamesEntry_text_changed_cb, NULL);
etk_signal_unblock("toggled",ETK_OBJECT(UI_PartEventsCheck),
on_PartEventsCheck_toggled, NULL);
etk_signal_unblock("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_program.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_program.c 2 Jul 2008 13:50:01 -0000 1.3
+++ edje_editor_program.c 2 Jul 2008 14:08:41 -0000 1.4
@@ -213,7 +213,7 @@
ETK_CALLBACK(on_ActionComboBox_changed), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_ProgramEntry),
- ETK_CALLBACK(on_NamesEntry_text_changed), NULL);
+ ETK_CALLBACK(_group_NamesEntry_text_changed_cb), NULL);
etk_signal_connect("key-down", ETK_OBJECT(UI_ProgramEntry),
ETK_CALLBACK(on_ProgramEntry_key_down), NULL);
etk_signal_connect("mouse-click", ETK_OBJECT(UI_ProgramEntryImage),
@@ -264,7 +264,7 @@
//Stop signal propagation
etk_signal_block("text-changed", ETK_OBJECT(UI_ProgramEntry),
- ETK_CALLBACK(on_NamesEntry_text_changed), NULL);
+ ETK_CALLBACK(_group_NamesEntry_text_changed_cb), NULL);
etk_signal_block("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),
ETK_CALLBACK(on_SourceEntry_text_changed), UI_SourceEntry);
@@ -371,7 +371,7 @@
//Reenable signal propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_ProgramEntry),
- ETK_CALLBACK(on_NamesEntry_text_changed), NULL);
+ ETK_CALLBACK(_group_NamesEntry_text_changed_cb), NULL);
etk_signal_unblock("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),
ETK_CALLBACK(on_SourceEntry_text_changed), UI_SourceEntry);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_state.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_state.c 2 Jul 2008 13:50:01 -0000 1.3
+++ edje_editor_state.c 2 Jul 2008 14:08:41 -0000 1.4
@@ -151,7 +151,7 @@
etk_signal_connect("mouse-click", ETK_OBJECT(UI_StateEntryImage),
ETK_CALLBACK(on_StateEntryImage_mouse_clicked), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_StateEntry),
- ETK_CALLBACK(on_NamesEntry_text_changed), NULL);
+ ETK_CALLBACK(_group_NamesEntry_text_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
@@ -181,7 +181,7 @@
{
//Stop signal propagation
etk_signal_block("text-changed", ETK_OBJECT(UI_StateEntry),
- on_NamesEntry_text_changed, NULL);
+ _group_NamesEntry_text_changed_cb, 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),
@@ -244,7 +244,7 @@
//ReEnable Signal Propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_StateEntry),
- on_NamesEntry_text_changed, NULL);
+ _group_NamesEntry_text_changed_cb, 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),
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_window.c 2 Jul 2008 13:50:01 -0000 1.4
+++ edje_editor_window.c 2 Jul 2008 14:08:41 -0000 1.5
@@ -165,7 +165,7 @@
//GroupEmbed
UI_GroupEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_GroupEmbed), create_group_frame());
+ 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);
etk_widget_show_all(UI_GroupEmbed);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- main.c 2 Jul 2008 13:50:01 -0000 1.45
+++ main.c 2 Jul 2008 14:08:41 -0000 1.46
@@ -166,7 +166,7 @@
PopulateSourceComboEntry();
PopulateSignalComboEntry();
- UpdateGroupFrame();
+ group_frame_update();
UpdatePartFrame();
//update FakeWin title
-------------------------------------------------------------------------
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
