Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_state.c edje_editor_state.h edje_editor_tree.c
edje_editor_window.c
Log Message:
cleans & renames of edje_editor_state.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_state.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_state.c 2 Jul 2008 14:08:41 -0000 1.4
+++ edje_editor_state.c 2 Jul 2008 16:20:24 -0000 1.5
@@ -5,9 +5,9 @@
#include "main.h"
-
+/*** Implementation ***/
Etk_Widget*
-create_description_frame(void)
+state_frame_create(void)
{
Etk_Widget *vbox;
Etk_Widget *hbox;
@@ -147,26 +147,26 @@
etk_signal_connect("key-down", ETK_OBJECT(UI_StateEntry),
- ETK_CALLBACK(on_StateEntry_key_down), NULL);
+ ETK_CALLBACK(_state_Entry_key_down_cb), NULL);
etk_signal_connect("mouse-click", ETK_OBJECT(UI_StateEntryImage),
- ETK_CALLBACK(on_StateEntryImage_mouse_clicked), NULL);
+ ETK_CALLBACK(_state_EntryImage_clicked_cb), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_StateEntry),
ETK_CALLBACK(_group_NamesEntry_text_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
- ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_AspectSpinner_value_changed_cb),
NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
- ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_AspectSpinner_value_changed_cb),
NULL);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_AspectComboBox),
- ETK_CALLBACK(on_AspectComboBox_changed), NULL);
+ ETK_CALLBACK(_state_AspectComboBox_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateMinWSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateMinHSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateMaxWSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)STATE_ALIGNV_SPINNER);
@@ -177,25 +177,25 @@
}
void
-UpdateDescriptionFrame(void)
+state_frame_update(void)
{
//Stop signal propagation
etk_signal_block("text-changed", ETK_OBJECT(UI_StateEntry),
_group_NamesEntry_text_changed_cb, NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
- ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_AspectSpinner_value_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
- ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_AspectSpinner_value_changed_cb), NULL);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_AspectComboBox),
- ETK_CALLBACK(on_AspectComboBox_changed), NULL);
+ ETK_CALLBACK(_state_AspectComboBox_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_StateMinWSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_StateMinHSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_StateMaxWSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)STATE_ALIGNV_SPINNER);
@@ -246,19 +246,19 @@
etk_signal_unblock("text-changed", ETK_OBJECT(UI_StateEntry),
_group_NamesEntry_text_changed_cb, NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_AspectMinSpinner),
- ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_AspectSpinner_value_changed_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_AspectMaxSpinner),
- ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_AspectSpinner_value_changed_cb),
NULL);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_AspectComboBox),
- ETK_CALLBACK(on_AspectComboBox_changed), NULL);
+ ETK_CALLBACK(_state_AspectComboBox_changed_cb), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMinWSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMinHSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMaxWSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
- ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
+ ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)STATE_ALIGNV_SPINNER);
@@ -268,8 +268,10 @@
}
+
+/*** Callbacks ***/
Etk_Bool
-on_StateEntry_key_down(Etk_Object *object, Etk_Event_Key_Down *event, void
*data)
+_state_Entry_key_down_cb(Etk_Object *object, Etk_Event_Key_Down *event, void
*data)
{
printf("PRESSED %s\n", event->keyname);
if (!strcmp("default 0.00", Cur.state->string))
@@ -279,14 +281,13 @@
}
if (!strcmp(event->keyname, "Return"))
- on_StateEntryImage_mouse_clicked(
-
ETK_OBJECT(ETK_ENTRY(object)->secondary_image),
- NULL);
+
_state_EntryImage_clicked_cb(ETK_OBJECT(ETK_ENTRY(object)->secondary_image),
+ NULL);
return ETK_TRUE;
}
Etk_Bool
-on_StateEntryImage_mouse_clicked(Etk_Object *object, void *data)
+_state_EntryImage_clicked_cb(Etk_Object *object, void *data)
{
const char *name;
@@ -328,7 +329,7 @@
}
Etk_Bool
-on_AspectSpinner_value_changed(Etk_Range *range, double value, void *data)
+_state_AspectSpinner_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("Value Changed Signal on AspectMinSpinner EMITTED\n");
edje_edit_state_aspect_min_set(edje_o, Cur.part->string, Cur.state->string,
@@ -339,7 +340,7 @@
}
Etk_Bool
-on_AspectComboBox_changed(Etk_Combobox *combobox, void *data)
+_state_AspectComboBox_changed_cb(Etk_Combobox *combobox, void *data)
{
printf("Active Item Changed Signal on AspectComboBox EMITTED\n");
int pref;
@@ -349,7 +350,7 @@
}
Etk_Bool
-on_StateMinMaxSpinner_value_changed(Etk_Range *range, double value, void *data)
+_state_MinMaxSpinner_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("Active Item Changed Signal on MinMaxSpinners EMITTED\n");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_state.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_state.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_state.h 2 Jul 2008 16:20:24 -0000 1.2
@@ -16,15 +16,15 @@
Etk_Widget *UI_StateAlignHSpinner;
-Etk_Widget* create_description_frame(void);
-void UpdateDescriptionFrame(void);
+Etk_Widget* state_frame_create (void);
+void state_frame_update (void);
-Etk_Bool on_StateEntry_key_down (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
-Etk_Bool on_StateEntryImage_mouse_clicked (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);
-Etk_Bool on_StateMinMaxSpinner_value_changed(Etk_Range *range, double value,
void *data);
+Etk_Bool _state_Entry_key_down_cb (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
+Etk_Bool _state_EntryImage_clicked_cb (Etk_Object *object, void
*data);
+Etk_Bool _state_AspectSpinner_value_changed_cb (Etk_Range *range, double
value, void *data);
+Etk_Bool _state_AspectComboBox_changed_cb (Etk_Combobox *combobox, void
*data);
+Etk_Bool _state_MinMaxSpinner_value_changed_cb (Etk_Range *range, double
value, void *data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje_editor_tree.c 2 Jul 2008 15:58:27 -0000 1.8
+++ edje_editor_tree.c 2 Jul 2008 16:20:24 -0000 1.9
@@ -281,7 +281,7 @@
edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string);
- UpdateDescriptionFrame();
+ state_frame_update();
position_frame_update();
position_comboboxes_update();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_editor_window.c 2 Jul 2008 15:58:27 -0000 1.11
+++ edje_editor_window.c 2 Jul 2008 16:20:24 -0000 1.12
@@ -183,7 +183,7 @@
//DescriptionEmbed
UI_DescriptionEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_DescriptionEmbed),
create_description_frame());
+ 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);
etk_widget_show_all(UI_DescriptionEmbed);
-------------------------------------------------------------------------
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
