Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_canvas.c edje_editor_part.c edje_editor_position.c
edje_editor_position.h edje_editor_toolbar.c
edje_editor_tree.c edje_editor_window.c main.c
Log Message:
cleans & renames of edje_editor_position.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_canvas.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_canvas.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_canvas.c 2 Jul 2008 15:22:38 -0000 1.3
@@ -55,7 +55,7 @@
edje_edit_state_rel1_relative_y_set(edje_o, Cur.part->string,
Cur.state->string,(float)(mouse_y - parenty)/(float)parenth);
- UpdatePositionFrame();
+ position_frame_update();
}
// Move Rel2 Point
if ((int)data == DRAG_REL2)
@@ -74,7 +74,7 @@
edje_edit_state_rel2_relative_y_set(edje_o, Cur.part->string,
Cur.state->string, (float)(mouse_y -
parenty)/(float)parenth);
- UpdatePositionFrame();
+ position_frame_update();
}
// Move Move Handler
if ((int)data == DRAG_MOVE)
@@ -106,7 +106,7 @@
Cur.part->string, Cur.state->string,
(float)(mouse_y - parenty - dy + dy2)/(float)parenth);
- UpdatePositionFrame();
+ position_frame_update();
}
canvas_redraw();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_part.c 2 Jul 2008 15:01:49 -0000 1.4
+++ edje_editor_part.c 2 Jul 2008 15:22:38 -0000 1.5
@@ -315,7 +315,7 @@
Parts_Hash = evas_hash_add(Parts_Hash, name, row);
/* Recreate rel combobox */
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
/* Hide the image */
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_position.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_position.c 2 Jul 2008 15:01:49 -0000 1.4
+++ edje_editor_position.c 2 Jul 2008 15:22:38 -0000 1.5
@@ -4,9 +4,9 @@
#include <Edje_Edit.h>
#include "main.h"
-
+/*** Implementation ***/
Etk_Widget*
-create_position_frame(void)
+position_frame_create(void)
{
Etk_Widget *vbox;
Etk_Widget *hbox;
@@ -184,38 +184,128 @@
etk_box_append(ETK_BOX(hbox), UI_Rel2ToYComboBox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void *)REL1X_SPINNER);
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void *)REL1X_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void *)REL1Y_SPINNER);
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void *)REL1Y_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void *)REL2X_SPINNER);
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void *)REL2X_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed), (void *)REL2Y_SPINNER);
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void *)REL2Y_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed), (void *)REL1X_SPINNER);
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void *)REL1X_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed), (void *)REL1Y_SPINNER);
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void *)REL1Y_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed), (void *)REL2X_SPINNER);
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void *)REL2X_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed), (void *)REL2Y_SPINNER);
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void *)REL2Y_SPINNER);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL1X_SPINNER);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL1Y_SPINNER);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL2X_SPINNER);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL2Y_SPINNER);
return vbox;
}
void
-PopulateRelComboBoxes(void)
+position_frame_update(void)
+{
+ //printf("Update Position: %s (offset:
%d)\n",Cur.eps->name,Cur.eps->rel1.offset.x);
+ //Stop signal propagation
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL1X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL1Y_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL2X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL2Y_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
+ ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL1X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
+ ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL1Y_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
+ ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL2X_SPINNER);
+ etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
+ ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL2Y_SPINNER);
+
+ if (!etk_string_length_get(Cur.state)) return;
+ if (!etk_string_length_get(Cur.part)) return;
+ //Set relative position spinners
+ etk_range_value_set(ETK_RANGE(UI_Rel1XSpinner),
+ edje_edit_state_rel1_relative_x_get(edje_o,
Cur.part->string,Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_Rel1YSpinner),
+ edje_edit_state_rel1_relative_y_get(edje_o,
Cur.part->string,Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_Rel2XSpinner),
+ edje_edit_state_rel2_relative_x_get(edje_o,
Cur.part->string,Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_Rel2YSpinner),
+ edje_edit_state_rel2_relative_y_get(edje_o,
Cur.part->string,Cur.state->string));
+
+ etk_range_value_set(ETK_RANGE(UI_Rel1XOffsetSpinner),
+ edje_edit_state_rel1_offset_x_get(edje_o,
Cur.part->string,Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_Rel1YOffsetSpinner),
+ edje_edit_state_rel1_offset_y_get(edje_o,
Cur.part->string,Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_Rel2XOffsetSpinner),
+ edje_edit_state_rel2_offset_x_get(edje_o,
Cur.part->string,Cur.state->string));
+ etk_range_value_set(ETK_RANGE(UI_Rel2YOffsetSpinner),
+ edje_edit_state_rel2_offset_y_get(edje_o,
Cur.part->string,Cur.state->string));
+
+ //Reenable signal propagation
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL1X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL1Y_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL2X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
+ ETK_CALLBACK(_position_RelSpinners_value_changed_cb),
+ (void*)REL2Y_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL1X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL1Y_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL2X_SPINNER);
+ etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
+
ETK_CALLBACK(_position_RelOffsetSpinners_value_changed_cb),
+ (void*)REL2Y_SPINNER);
+}
+
+void
+position_comboboxes_populate(void)
{
Evas_List *l;
char *image_name;
@@ -223,13 +313,17 @@
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_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL1X_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL1Y_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL2X_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL2Y_SPINNER);
etk_signal_block("item-activated", ETK_OBJECT(UI_CliptoComboBox),
ETK_CALLBACK(_part_CliptoComboBox_item_activated_cb),
NULL);
@@ -293,99 +387,24 @@
//Reenable signal propagation
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL1X_SPINNER);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL1Y_SPINNER);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL2X_SPINNER);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void *)REL2Y_SPINNER);
etk_signal_unblock("item-activated", ETK_OBJECT(UI_CliptoComboBox),
ETK_CALLBACK(_part_CliptoComboBox_item_activated_cb),
NULL);
}
void
-UpdatePositionFrame(void)
-{
- //printf("Update Position: %s (offset:
%d)\n",Cur.eps->name,Cur.eps->rel1.offset.x);
- //Stop signal propagation
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL1X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL1Y_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL2X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL2Y_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL1X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL1Y_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL2X_SPINNER);
- etk_signal_block("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL2Y_SPINNER);
-
- if (!etk_string_length_get(Cur.state)) return;
- if (!etk_string_length_get(Cur.part)) return;
- //Set relative position spinners
- etk_range_value_set(ETK_RANGE(UI_Rel1XSpinner),
- edje_edit_state_rel1_relative_x_get(edje_o,
Cur.part->string,Cur.state->string));
- etk_range_value_set(ETK_RANGE(UI_Rel1YSpinner),
- edje_edit_state_rel1_relative_y_get(edje_o,
Cur.part->string,Cur.state->string));
- etk_range_value_set(ETK_RANGE(UI_Rel2XSpinner),
- edje_edit_state_rel2_relative_x_get(edje_o,
Cur.part->string,Cur.state->string));
- etk_range_value_set(ETK_RANGE(UI_Rel2YSpinner),
- edje_edit_state_rel2_relative_y_get(edje_o,
Cur.part->string,Cur.state->string));
-
- etk_range_value_set(ETK_RANGE(UI_Rel1XOffsetSpinner),
- edje_edit_state_rel1_offset_x_get(edje_o,
Cur.part->string,Cur.state->string));
- etk_range_value_set(ETK_RANGE(UI_Rel1YOffsetSpinner),
- edje_edit_state_rel1_offset_y_get(edje_o,
Cur.part->string,Cur.state->string));
- etk_range_value_set(ETK_RANGE(UI_Rel2XOffsetSpinner),
- edje_edit_state_rel2_offset_x_get(edje_o,
Cur.part->string,Cur.state->string));
- etk_range_value_set(ETK_RANGE(UI_Rel2YOffsetSpinner),
- edje_edit_state_rel2_offset_y_get(edje_o,
Cur.part->string,Cur.state->string));
-
- //Reenable signal propagation
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL1X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL1Y_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL2X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YSpinner),
- ETK_CALLBACK(on_RelSpinner_value_changed),
- (void*)REL2Y_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1XOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL1X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel1YOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL1Y_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2XOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL2X_SPINNER);
- etk_signal_unblock("value-changed", ETK_OBJECT(UI_Rel2YOffsetSpinner),
- ETK_CALLBACK(on_RelOffsetSpinner_value_changed),
- (void*)REL2Y_SPINNER);
-}
-
-
-void
-UpdateComboPositionFrame(void)
+position_comboboxes_update(void)
{
int i=0;
Etk_Combobox_Item *item = NULL;
@@ -394,13 +413,17 @@
//Stop signal propagation
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL1X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL1X_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL1Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL1Y_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL2X_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL2Y_SPINNER);
if (!etk_string_length_get(Cur.part)) return;
if (!etk_string_length_get(Cur.state)) return;
@@ -481,18 +504,23 @@
//Reenable signal propagation
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL1X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL1X_SPINNER);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL1Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL1Y_SPINNER);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2X_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL2X_SPINNER);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
- ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2Y_SPINNER);
+ ETK_CALLBACK(_position_RelToComboBoxes_changed_cb),
+ (void*)REL2Y_SPINNER);
}
+/*** Callbacks ***/
Etk_Bool
-on_RelOffsetSpinner_value_changed(Etk_Range *range, double value, void *data)
+_position_RelOffsetSpinners_value_changed_cb(Etk_Range *range, double value,
void *data)
{
printf("Value Changed Signal on Offset Spinner EMITTED\n");
@@ -528,7 +556,7 @@
}
Etk_Bool
-on_RelSpinner_value_changed(Etk_Range *range, double value, void *data)
+_position_RelSpinners_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("Value Changed Signal on RelSpinner EMITTED (value:
%f)\n",etk_range_value_get(range));
@@ -564,7 +592,7 @@
}
Etk_Bool
-on_RelToComboBox_changed(Etk_Combobox *combobox, void *data)
+_position_RelToComboBoxes_changed_cb(Etk_Combobox *combobox, void *data)
{
char *parent;
parent =
etk_combobox_item_field_get(etk_combobox_active_item_get(combobox), 1);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_position.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_position.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_position.h 2 Jul 2008 15:22:38 -0000 1.2
@@ -16,15 +16,16 @@
Etk_Widget *UI_Rel2ToXComboBox;
Etk_Widget *UI_Rel2ToYComboBox;
-Etk_Widget* create_position_frame(void);
-void PopulateRelComboBoxes(void);
-void UpdatePositionFrame(void);
-void UpdateComboPositionFrame(void);
+Etk_Widget* position_frame_create(void);
+void position_frame_update(void);
+void position_comboboxes_populate(void);
+void position_comboboxes_update(void);
-Etk_Bool on_RelOffsetSpinner_value_changed (Etk_Range *range, double value,
void *data);
-Etk_Bool on_RelSpinner_value_changed (Etk_Range *range, double value,
void *data);
-Etk_Bool on_RelToComboBox_changed (Etk_Combobox *combobox, void
*data);
+
+Etk_Bool _position_RelOffsetSpinners_value_changed_cb (Etk_Range *range,
double value, void *data);
+Etk_Bool _position_RelSpinners_value_changed_cb (Etk_Range *range,
double value, void *data);
+Etk_Bool _position_RelToComboBoxes_changed_cb (Etk_Combobox *combobox,
void *data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_toolbar.c 2 Jul 2008 13:50:01 -0000 1.3
+++ edje_editor_toolbar.c 2 Jul 2008 15:22:38 -0000 1.4
@@ -357,7 +357,7 @@
row = AddPartToTree(name, NULL);
etk_tree_row_select(row);
etk_tree_row_unfold(row);
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
break;
@@ -393,7 +393,7 @@
etk_tree_row_select(row);
etk_tree_row_unfold(row);
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
break;
@@ -431,7 +431,7 @@
etk_tree_row_select(row);
etk_tree_row_unfold(row);
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
break;
case NEW_SWAL:
@@ -454,7 +454,7 @@
row = AddPartToTree(name, NULL);
etk_tree_row_select(row);
etk_tree_row_unfold(row);
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
break;
case NEW_GROUPSWAL:
@@ -477,7 +477,7 @@
row = AddPartToTree(name, NULL);
etk_tree_row_select(row);
etk_tree_row_unfold(row);
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
break;
@@ -615,7 +615,7 @@
Cur.state = etk_string_clear(Cur.state);
}
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
//ev_redraw();
break;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_tree.c 2 Jul 2008 15:01:49 -0000 1.4
+++ edje_editor_tree.c 2 Jul 2008 15:22:38 -0000 1.5
@@ -282,8 +282,8 @@
edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string);
UpdateDescriptionFrame();
- UpdatePositionFrame();
- UpdateComboPositionFrame();
+ position_frame_update();
+ position_comboboxes_update();
switch(edje_edit_part_type_get(edje_o, Cur.part->string))
{
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_editor_window.c 2 Jul 2008 15:01:49 -0000 1.7
+++ edje_editor_window.c 2 Jul 2008 15:22:38 -0000 1.8
@@ -219,7 +219,7 @@
//PositionEmbed
UI_PositionEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_PositionEmbed), create_position_frame());
+ etk_container_add(ETK_CONTAINER(UI_PositionEmbed), position_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_PositionEmbed),
_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_PositionEmbed);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- main.c 2 Jul 2008 15:01:49 -0000 1.47
+++ main.c 2 Jul 2008 15:22:38 -0000 1.48
@@ -162,7 +162,7 @@
Cur.prog = etk_string_clear(Cur.prog);
PopulateTree();
- PopulateRelComboBoxes();
+ position_comboboxes_populate();
PopulateSourceComboEntry();
PopulateSignalComboEntry();
-------------------------------------------------------------------------
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
