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_program.c edje_editor_program.h
edje_editor_toolbar.c edje_editor_tree.c edje_editor_window.c
main.c
Log Message:
cleans & renames of edje_editor_program.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_part.c 2 Jul 2008 15:22:38 -0000 1.5
+++ edje_editor_part.c 2 Jul 2008 15:48:11 -0000 1.6
@@ -316,7 +316,7 @@
/* Recreate rel combobox */
position_comboboxes_populate();
- PopulateSourceComboEntry();
+ program_source_combo_populate();
/* Hide the image */
etk_widget_hide(ETK_WIDGET(UI_PartNameEntryImage));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_program.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_program.c 2 Jul 2008 14:08:41 -0000 1.4
+++ edje_editor_program.c 2 Jul 2008 15:48:11 -0000 1.5
@@ -5,8 +5,9 @@
#include "main.h"
+/*** Implementation ***/
Etk_Widget*
-create_program_frame(void)
+program_frame_create(void)
{
Etk_Widget *table;
Etk_Widget *label;
@@ -99,20 +100,20 @@
ETK_COMBOBOX_LABEL, 75, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_ActionComboBox));
etk_table_attach_default(ETK_TABLE(table),UI_ActionComboBox, 1, 3, 5, 5);
-
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "None");
etk_combobox_item_data_set(item, (void*)EDJE_ACTION_TYPE_NONE);
-
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "State Set");
etk_combobox_item_data_set(item, (void*)EDJE_ACTION_TYPE_STATE_SET);
-
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Action Stop");
etk_combobox_item_data_set(ETK_COMBOBOX_ITEM(item),
(void*)EDJE_ACTION_TYPE_ACTION_STOP);
-
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Signal Emit");
etk_combobox_item_data_set(ETK_COMBOBOX_ITEM(item),
@@ -122,12 +123,12 @@
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Drag val
set");
etk_combobox_item_data_set(ETK_COMBOBOX_ITEM(item),
(void*)EDJE_ACTION_TYPE_DRAG_VAL_SET);
-
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Drag val
step");
etk_combobox_item_data_set(ETK_COMBOBOX_ITEM(item),
(void*)EDJE_ACTION_TYPE_DRAG_VAL_STEP);
-
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Drag val
page");
etk_combobox_item_data_set(ETK_COMBOBOX_ITEM(item),
@@ -137,7 +138,7 @@
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Embryo
script");
etk_combobox_item_data_set(ETK_COMBOBOX_ITEM(item),
(void*)EDJE_ACTION_TYPE_SCRIPT);
-
+
//UI_TargetEntry
UI_TargetLabel = etk_label_new("<b>Target(s)</b>");
etk_table_attach(ETK_TABLE(table),UI_TargetLabel,0,0,6,6,ETK_TABLE_NONE,0,0);
@@ -159,7 +160,6 @@
etk_widget_size_request_set(UI_Param1Spinner,45, 20);
etk_table_attach_default(ETK_TABLE(table),UI_Param1Spinner, 3, 3, 7, 7);
-
//UI_TransiComboBox
UI_TransiLabel = etk_label_new("<b>Transition</b>");
etk_table_attach(ETK_TABLE(table), UI_TransiLabel, 0, 0, 8,
8,ETK_TABLE_NONE,0,0);
@@ -186,7 +186,6 @@
item = etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Decelerate");
etk_combobox_item_data_set(item, (void*)EDJE_TWEEN_MODE_DECELERATE);
-
//DurationSpinner
UI_DurationSpinner = etk_spinner_new(0.0, 999.0, 0.0, 0.1, 1.0);
@@ -210,52 +209,52 @@
etk_table_attach_default(ETK_TABLE(table),UI_Param2Spinner, 3, 3, 9, 9);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_ActionComboBox),
- ETK_CALLBACK(on_ActionComboBox_changed), NULL);
+ ETK_CALLBACK(_program_ActionComboBox_changed_cb), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_ProgramEntry),
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_CALLBACK(_program_Entry_key_down_cb), NULL);
etk_signal_connect("mouse-click", ETK_OBJECT(UI_ProgramEntryImage),
- ETK_CALLBACK(on_ProgramEntryImage_mouse_clicked), NULL);
+ ETK_CALLBACK(_program_EntryImage_clicked_cb), NULL);
etk_signal_connect("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),
- ETK_CALLBACK(on_SourceEntry_text_changed), UI_SourceEntry);
+ ETK_CALLBACK(_program_SourceEntry_text_changed_cb), UI_SourceEntry);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SourceEntry),
- ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
+ ETK_CALLBACK(_program_SourceEntry_item_changed_cb), NULL);
etk_signal_connect("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SignalEntry))),
- ETK_CALLBACK(on_SignalEntry_text_changed), UI_SignalEntry);
+ ETK_CALLBACK(_program_SignalEntry_text_changed_cb), UI_SignalEntry);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SignalEntry),
- ETK_CALLBACK(on_SignalEntry_item_changed), NULL);
+ ETK_CALLBACK(_program_SignalEntry_item_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_DelayFromSpinner),
- ETK_CALLBACK(on_DelaySpinners_value_changed),NULL);
+ ETK_CALLBACK(_program_DelaySpinners_value_changed_cb),NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_DelayRangeSpinner),
- ETK_CALLBACK(on_DelaySpinners_value_changed),NULL);
+ ETK_CALLBACK(_program_DelaySpinners_value_changed_cb),NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_TargetEntry),
- ETK_CALLBACK(on_TargetEntry_text_changed), NULL);
+ ETK_CALLBACK(_program_TargetEntry_text_changed_cb), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_Param1Entry),
- ETK_CALLBACK(on_Param1Entry_text_changed), NULL);
+ ETK_CALLBACK(_program_Param1Entry_text_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Param1Spinner),
- ETK_CALLBACK(on_Param1Spinner_value_changed), NULL);
+ ETK_CALLBACK(_program_Param1Spinner_value_changed_cb), NULL);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_TransiComboBox),
- ETK_CALLBACK(on_TransitionComboBox_changed), NULL);
+ ETK_CALLBACK(_program_TransitionComboBox_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_DurationSpinner),
- ETK_CALLBACK(on_DurationSpinner_value_changed), NULL);
+ ETK_CALLBACK(_program_DurationSpinner_value_changed_cb), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_AfterEntry),
- ETK_CALLBACK(on_AfterEntry_text_changed), NULL);
+ ETK_CALLBACK(_program_AfterEntry_text_changed_cb), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_Param2Entry),
- ETK_CALLBACK(on_Param2Entry_text_changed), NULL);
+ ETK_CALLBACK(_program_Param2Entry_text_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Param2Spinner),
- ETK_CALLBACK(on_Param2Spinner_value_changed), NULL);
+ ETK_CALLBACK(_program_Param2Spinner_value_changed_cb), NULL);
return table;
}
void
-UpdateProgFrame(void)
+program_frame_update(void)
{
const char *s;
Evas_List *l;
@@ -267,31 +266,31 @@
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);
+ ETK_CALLBACK(_program_SourceEntry_text_changed_cb), UI_SourceEntry);
etk_signal_block("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SignalEntry))),
- ETK_CALLBACK(on_SignalEntry_text_changed), UI_SignalEntry);
+ ETK_CALLBACK(_program_SignalEntry_text_changed_cb), UI_SignalEntry);
etk_signal_block("value-changed", ETK_OBJECT(UI_DelayFromSpinner),
- ETK_CALLBACK(on_DelaySpinners_value_changed), NULL);
+ ETK_CALLBACK(_program_DelaySpinners_value_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_DelayRangeSpinner),
- ETK_CALLBACK(on_DelaySpinners_value_changed), NULL);
+ ETK_CALLBACK(_program_DelaySpinners_value_changed_cb), NULL);
etk_signal_block("text-changed", ETK_OBJECT(UI_TargetEntry),
- ETK_CALLBACK(on_TargetEntry_text_changed), NULL);
+ ETK_CALLBACK(_program_TargetEntry_text_changed_cb), NULL);
etk_signal_block("text-changed", ETK_OBJECT(UI_Param1Entry),
- ETK_CALLBACK(on_Param1Entry_text_changed), NULL);
+ ETK_CALLBACK(_program_Param1Entry_text_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_Param1Spinner),
- ETK_CALLBACK(on_Param1Spinner_value_changed), NULL);
+ ETK_CALLBACK(_program_Param1Spinner_value_changed_cb), NULL);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_TransiComboBox),
- ETK_CALLBACK(on_TransitionComboBox_changed), NULL);
+ ETK_CALLBACK(_program_TransitionComboBox_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_DurationSpinner),
- ETK_CALLBACK(on_DurationSpinner_value_changed), NULL);
+ ETK_CALLBACK(_program_DurationSpinner_value_changed_cb), NULL);
etk_signal_block("text-changed", ETK_OBJECT(UI_AfterEntry),
- ETK_CALLBACK(on_AfterEntry_text_changed), NULL);
+ ETK_CALLBACK(_program_AfterEntry_text_changed_cb), NULL);
etk_signal_block("text-changed", ETK_OBJECT(UI_Param2Entry),
- ETK_CALLBACK(on_Param2Entry_text_changed), NULL);
+ ETK_CALLBACK(_program_Param2Entry_text_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_Param2Spinner),
- ETK_CALLBACK(on_Param2Spinner_value_changed), NULL);
-
+ ETK_CALLBACK(_program_Param2Spinner_value_changed_cb), NULL);
+
//Update Program Entry (name)
etk_entry_text_set(ETK_ENTRY(UI_ProgramEntry), Cur.prog->string);
etk_widget_hide(ETK_WIDGET(UI_ProgramEntryImage));
@@ -301,13 +300,13 @@
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(
ETK_COMBOBOX_ENTRY(UI_SourceEntry))),s);
edje_edit_string_free(s);
-
+
//Update Signal
s = edje_edit_program_signal_get(edje_o, Cur.prog->string);
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(
ETK_COMBOBOX_ENTRY(UI_SignalEntry))),s);
edje_edit_string_free(s);
-
+
//Update Delay
etk_range_value_set(ETK_RANGE(UI_DelayFromSpinner),
edje_edit_program_in_from_get(edje_o,
Cur.prog->string));
@@ -332,7 +331,7 @@
if (str->length > 1)
str = etk_string_truncate(str, str->length - 1);
etk_entry_text_set(ETK_ENTRY(UI_TargetEntry),str->string);
-
+
//Update Afters(s)
str = etk_string_clear(str);
l = edje_edit_program_afters_get(edje_o, Cur.prog->string);
@@ -344,7 +343,6 @@
if (str->length > 1)
str = etk_string_truncate(str, str->length - 1);
etk_entry_text_set(ETK_ENTRY(UI_AfterEntry),str->string);
-
//Update state & state value
s = edje_edit_program_state_get(edje_o, Cur.prog->string);
@@ -358,7 +356,7 @@
etk_range_value_set(ETK_RANGE(UI_Param2Spinner),
edje_edit_program_value2_get(edje_o,
Cur.prog->string));
edje_edit_string_free(s);
-
+
//Update Transition
etk_combobox_active_item_set(ETK_COMBOBOX(UI_TransiComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_TransiComboBox),
@@ -367,43 +365,41 @@
//Update Transition Duration
etk_range_value_set(ETK_RANGE(UI_DurationSpinner),
edje_edit_program_transition_time_get(edje_o,
Cur.prog->string));
-
-
+
//Reenable signal propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_ProgramEntry),
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);
+ ETK_CALLBACK(_program_SourceEntry_text_changed_cb), UI_SourceEntry);
etk_signal_unblock("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SignalEntry))),
- ETK_CALLBACK(on_SignalEntry_text_changed), UI_SignalEntry);
+ ETK_CALLBACK(_program_SignalEntry_text_changed_cb), UI_SignalEntry);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_DelayFromSpinner),
- ETK_CALLBACK(on_DelaySpinners_value_changed), NULL);
+ ETK_CALLBACK(_program_DelaySpinners_value_changed_cb), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_DelayRangeSpinner),
- ETK_CALLBACK(on_DelaySpinners_value_changed), NULL);
+ ETK_CALLBACK(_program_DelaySpinners_value_changed_cb), NULL);
etk_signal_unblock("text-changed", ETK_OBJECT(UI_TargetEntry),
- ETK_CALLBACK(on_TargetEntry_text_changed), NULL);
+ ETK_CALLBACK(_program_TargetEntry_text_changed_cb), NULL);
etk_signal_unblock("text-changed", ETK_OBJECT(UI_Param1Entry),
- ETK_CALLBACK(on_Param1Entry_text_changed), NULL);
+ ETK_CALLBACK(_program_Param1Entry_text_changed_cb), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_Param1Spinner),
- ETK_CALLBACK(on_Param1Spinner_value_changed), NULL);
+ ETK_CALLBACK(_program_Param1Spinner_value_changed_cb), NULL);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_TransiComboBox),
- ETK_CALLBACK(on_TransitionComboBox_changed), NULL);
+ ETK_CALLBACK(_program_TransitionComboBox_changed_cb), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_DurationSpinner),
- ETK_CALLBACK(on_DurationSpinner_value_changed), NULL);
+ ETK_CALLBACK(_program_DurationSpinner_value_changed_cb), NULL);
etk_signal_unblock("text-changed", ETK_OBJECT(UI_AfterEntry),
- ETK_CALLBACK(on_AfterEntry_text_changed), NULL);
+ ETK_CALLBACK(_program_AfterEntry_text_changed_cb), NULL);
etk_signal_unblock("text-changed", ETK_OBJECT(UI_Param2Entry),
- ETK_CALLBACK(on_Param2Entry_text_changed), NULL);
+ ETK_CALLBACK(_program_Param2Entry_text_changed_cb), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_Param2Spinner),
- ETK_CALLBACK(on_Param2Spinner_value_changed), NULL);
+ ETK_CALLBACK(_program_Param2Spinner_value_changed_cb), NULL);
etk_object_destroy(ETK_OBJECT(str));
}
-
void
-PopulateSourceComboEntry(void)
+program_source_combo_populate(void)
{
Evas_List *l;
char *image_name;
@@ -411,7 +407,7 @@
//Stop signal propagation
etk_signal_block("active-item-changed", ETK_OBJECT(UI_SourceEntry),
- ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
+ ETK_CALLBACK(_program_SourceEntry_item_changed_cb), NULL);
etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(UI_SourceEntry));
@@ -430,17 +426,17 @@
//Renable signal propagation
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_SourceEntry),
- ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
+ ETK_CALLBACK(_program_SourceEntry_item_changed_cb), NULL);
}
void
-PopulateSignalComboEntry(void)
+program_signal_combo_populate(void)
{
printf("Populate Program Signal ComboEntry\n");
//Stop signal propagation
etk_signal_block("active-item-changed", ETK_OBJECT(UI_SignalEntry),
- ETK_CALLBACK(on_SignalEntry_item_changed), NULL);
+ ETK_CALLBACK(_program_SignalEntry_item_changed_cb), NULL);
etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(UI_SignalEntry));
@@ -471,12 +467,13 @@
//Renable signal propagation
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_SignalEntry),
- ETK_CALLBACK(on_SignalEntry_item_changed), NULL);
+ ETK_CALLBACK(_program_SignalEntry_item_changed_cb), NULL);
}
+/*** Callbacks ***/
Etk_Bool
-on_ActionComboBox_changed(Etk_Combobox *combobox, void *data)
+_program_ActionComboBox_changed_cb(Etk_Combobox *combobox, void *data)
{
int action;
printf("Changed Signal on ActionComboBox EMITTED\n");
@@ -570,23 +567,20 @@
return ETK_TRUE;
}
-
-
-
Etk_Bool
-on_ProgramEntry_key_down(Etk_Object *object, Etk_Event_Key_Down *event, void
*data)
+_program_Entry_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_ProgramEntryImage_mouse_clicked(
+ _program_EntryImage_clicked_cb(
ETK_OBJECT(ETK_ENTRY(object)->secondary_image),
NULL);
return ETK_TRUE;
}
Etk_Bool
-on_ProgramEntryImage_mouse_clicked(Etk_Object *object, void *data)
+_program_EntryImage_clicked_cb(Etk_Object *object, void *data)
{
const char *name;
@@ -624,7 +618,7 @@
}
Etk_Bool
-on_SourceEntry_text_changed(Etk_Object *object, void *data)
+_program_SourceEntry_text_changed_cb(Etk_Object *object, void *data)
{
printf("Text Changed Signal on SourceEntry Emitted\n");
const char *str = etk_entry_text_get(ETK_ENTRY(object));
@@ -633,7 +627,7 @@
}
Etk_Bool
-on_SourceEntry_item_changed(Etk_Combobox_Entry *combo, void *data)
+_program_SourceEntry_item_changed_cb(Etk_Combobox_Entry *combo, void *data)
{
Etk_Combobox_Entry_Item *active_item = NULL;
char *pname;
@@ -652,7 +646,7 @@
}
Etk_Bool
-on_SignalEntry_item_changed(Etk_Combobox_Entry *combo, void *data)
+_program_SignalEntry_item_changed_cb(Etk_Combobox_Entry *combo, void *data)
{
Etk_Combobox_Entry_Item *active_item = NULL;
char *pname;
@@ -671,7 +665,7 @@
}
Etk_Bool
-on_SignalEntry_text_changed(Etk_Object *object, void *data)
+_program_SignalEntry_text_changed_cb(Etk_Object *object, void *data)
{
printf("Text Changed Signal on SignalEntry Emitted\n");
const char *str = etk_entry_text_get(ETK_ENTRY(object));
@@ -680,7 +674,7 @@
}
Etk_Bool
-on_DelaySpinners_value_changed(Etk_Range *range, double value, void *data)
+_program_DelaySpinners_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("value Changed Signal on DelayFromSpinner Emitted\n");
edje_edit_program_in_from_set(edje_o, Cur.prog->string,
@@ -693,7 +687,7 @@
}
Etk_Bool
-on_TargetEntry_text_changed(Etk_Object *object, void *data)
+_program_TargetEntry_text_changed_cb(Etk_Object *object, void *data)
{
char *text = strdup(etk_entry_text_get(ETK_ENTRY(object)));
char *tok;
@@ -719,7 +713,7 @@
}
Etk_Bool
-on_Param1Entry_text_changed(Etk_Object *object, void *data)
+_program_Param1Entry_text_changed_cb(Etk_Object *object, void *data)
{
printf("Text Changed Signal on Param1Entry Emitted\n");
@@ -730,7 +724,7 @@
}
Etk_Bool
-on_Param2Entry_text_changed(Etk_Object *object, void *data)
+_program_Param2Entry_text_changed_cb(Etk_Object *object, void *data)
{
printf("Text Changed Signal on Param2Entry Emitted\n");
@@ -741,7 +735,7 @@
}
Etk_Bool
-on_Param1Spinner_value_changed(Etk_Range *range, double value, void *data)
+_program_Param1Spinner_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("value Changed Signal on Param1Spinner Emitted\n");
edje_edit_program_value_set(edje_o, Cur.prog->string,
@@ -750,7 +744,7 @@
}
Etk_Bool
-on_Param2Spinner_value_changed(Etk_Range *range, double value, void *data)
+_program_Param2Spinner_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("value Changed Signal on Param2Spinner Emitted\n");
edje_edit_program_value2_set(edje_o, Cur.prog->string,
@@ -759,7 +753,7 @@
}
Etk_Bool
-on_TransitionComboBox_changed(Etk_Combobox *combobox, void *data)
+_program_TransitionComboBox_changed_cb(Etk_Combobox *combobox, void *data)
{
int trans;
printf("Changed Signal on TransitionComboBox Emitted\n");
@@ -772,7 +766,7 @@
}
Etk_Bool
-on_DurationSpinner_value_changed(Etk_Range *range, double value, void *data)
+_program_DurationSpinner_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("value Changed Signal on DurationSpinner Emitted\n");
if (etk_string_length_get(Cur.prog))
@@ -783,7 +777,7 @@
}
Etk_Bool
-on_AfterEntry_text_changed(Etk_Object *object, void *data)
+_program_AfterEntry_text_changed_cb(Etk_Object *object, void *data)
{
char *text = strdup(etk_entry_text_get(ETK_ENTRY(object)));
char *tok;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_program.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_program.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_program.h 2 Jul 2008 15:48:11 -0000 1.2
@@ -2,7 +2,6 @@
#define _EDJE_EDITOR_PROGRAM_H_
-
/* program frame objects */
Etk_Widget *UI_ProgramEntry;
Etk_Widget *UI_ProgramEntryImage;
@@ -26,26 +25,29 @@
Etk_Widget *UI_DelayFromSpinner;
Etk_Widget *UI_DelayRangeSpinner;
-Etk_Widget* create_program_frame(void);
-void UpdateProgFrame(void);
+
+Etk_Widget* program_frame_create(void);
+void program_frame_update(void);
+void program_source_combo_populate(void);
+void program_signal_combo_populate(void);
-Etk_Bool on_ActionComboBox_changed (Etk_Combobox *combobox, void
*data);
-Etk_Bool on_ProgramEntryImage_mouse_clicked(Etk_Object *object, void *data);
-Etk_Bool on_ProgramEntry_key_down (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
-Etk_Bool on_SourceEntry_text_changed (Etk_Object *object, void *data);
-Etk_Bool on_SourceEntry_item_changed (Etk_Combobox_Entry *combo, void
*data);
-Etk_Bool on_SignalEntry_text_changed (Etk_Object *object, void *data);
-Etk_Bool on_SignalEntry_item_changed (Etk_Combobox_Entry *combo, void
*data);
-Etk_Bool on_DelaySpinners_value_changed (Etk_Range *range, double value,
void *data);
-Etk_Bool on_TargetEntry_text_changed (Etk_Object *object, void *data);
-Etk_Bool on_Param1Entry_text_changed (Etk_Object *object, void *data);
-Etk_Bool on_Param2Entry_text_changed (Etk_Object *object, void *data);
-Etk_Bool on_Param1Spinner_value_changed (Etk_Range *range, double value,
void *data);
-Etk_Bool on_Param2Spinner_value_changed (Etk_Range *range, double value,
void *data);
-Etk_Bool on_TransitionComboBox_changed (Etk_Combobox *combobox, void
*data);
-Etk_Bool on_DurationSpinner_value_changed (Etk_Range *range, double value,
void *data);
-Etk_Bool on_AfterEntry_text_changed (Etk_Object *object, void *data);
+Etk_Bool _program_ActionComboBox_changed_cb (Etk_Combobox *combobox,
void *data);
+Etk_Bool _program_EntryImage_clicked_cb (Etk_Object *object, void
*data);
+Etk_Bool _program_Entry_key_down_cb (Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
+Etk_Bool _program_SourceEntry_text_changed_cb (Etk_Object *object, void
*data);
+Etk_Bool _program_SourceEntry_item_changed_cb (Etk_Combobox_Entry
*combo, void *data);
+Etk_Bool _program_SignalEntry_text_changed_cb (Etk_Object *object, void
*data);
+Etk_Bool _program_SignalEntry_item_changed_cb (Etk_Combobox_Entry
*combo, void *data);
+Etk_Bool _program_DelaySpinners_value_changed_cb (Etk_Range *range, double
value, void *data);
+Etk_Bool _program_TargetEntry_text_changed_cb (Etk_Object *object, void
*data);
+Etk_Bool _program_Param1Entry_text_changed_cb (Etk_Object *object, void
*data);
+Etk_Bool _program_Param2Entry_text_changed_cb (Etk_Object *object, void
*data);
+Etk_Bool _program_Param1Spinner_value_changed_cb (Etk_Range *range, double
value, void *data);
+Etk_Bool _program_Param2Spinner_value_changed_cb (Etk_Range *range, double
value, void *data);
+Etk_Bool _program_TransitionComboBox_changed_cb (Etk_Combobox *combobox,
void *data);
+Etk_Bool _program_DurationSpinner_value_changed_cb (Etk_Range *range, double
value, void *data);
+Etk_Bool _program_AfterEntry_text_changed_cb (Etk_Object *object, void
*data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_toolbar.c 2 Jul 2008 15:22:38 -0000 1.4
+++ edje_editor_toolbar.c 2 Jul 2008 15:48:11 -0000 1.5
@@ -358,7 +358,7 @@
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
- PopulateSourceComboEntry();
+ program_source_combo_populate();
break;
case NEW_IMAGE:
@@ -394,7 +394,7 @@
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
- PopulateSourceComboEntry();
+ program_source_combo_populate();
break;
case NEW_TEXT:
@@ -432,7 +432,7 @@
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
- PopulateSourceComboEntry();
+ program_source_combo_populate();
break;
case NEW_SWAL:
if (!etk_string_length_get(Cur.group))
@@ -455,7 +455,7 @@
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
- PopulateSourceComboEntry();
+ program_source_combo_populate();
break;
case NEW_GROUPSWAL:
if (!etk_string_length_get(Cur.group))
@@ -478,7 +478,7 @@
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
- PopulateSourceComboEntry();
+ program_source_combo_populate();
break;
case NEW_DESC:
@@ -616,7 +616,7 @@
}
position_comboboxes_populate();
- PopulateSourceComboEntry();
+ program_source_combo_populate();
//ev_redraw();
break;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_tree.c 2 Jul 2008 15:22:38 -0000 1.5
+++ edje_editor_tree.c 2 Jul 2008 15:48:11 -0000 1.6
@@ -333,7 +333,7 @@
edje_object_signal_emit(edje_ui,"script_frame_show_small","edje_editor");
UpdateScriptFrame();
- UpdateProgFrame();
+ program_frame_update();
// PopulateSourceComboBox();
break;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje_editor_window.c 2 Jul 2008 15:22:38 -0000 1.8
+++ edje_editor_window.c 2 Jul 2008 15:48:11 -0000 1.9
@@ -228,7 +228,7 @@
//ProgramEmbed
UI_ProgramEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_ProgramEmbed), create_program_frame());
+ 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);
etk_widget_show_all(UI_ProgramEmbed);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- main.c 2 Jul 2008 15:22:38 -0000 1.48
+++ main.c 2 Jul 2008 15:48:11 -0000 1.49
@@ -163,8 +163,8 @@
PopulateTree();
position_comboboxes_populate();
- PopulateSourceComboEntry();
- PopulateSignalComboEntry();
+ program_source_combo_populate();
+ program_signal_combo_populate();
group_frame_update();
part_frame_update();
-------------------------------------------------------------------------
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
