Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c interface.h main.h
Log Message:
* implemented all edje_edit_program_*_get() functions
* fix program frame (all fields are now correct)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- callbacks.c 16 Feb 2008 01:22:20 -0000 1.48
+++ callbacks.c 16 Feb 2008 16:52:59 -0000 1.49
@@ -832,71 +832,105 @@
Etk_Bool
on_ActionComboBox_changed(Etk_Combobox *combobox, void *data)
{
- Engrave_Action action;
- char param1[200],param2[200];
- double value,value2;
+ int action;
+ //char param1[200],param2[200];
+ //double value,value2;
printf("Changed Signal on ActionComboBox EMITTED\n");
-
- if (!Cur.epr) return ETK_TRUE;
+ int act;
+
+ if (!etk_string_length_get(Cur.prog)) return ETK_TRUE;
//Get the current action in the current program
-
engrave_program_action_get(Cur.epr,&action,¶m1,¶m2,200,200,&value,&value2);
+ //action = edje_edit_program_action_get(edje_o, Cur.prog->string);
//Get the new action from the combo data
- action = (Engrave_Action)etk_combobox_item_data_get(
+ action = (int)etk_combobox_item_data_get(
etk_combobox_active_item_get(combobox));
//set the action in the current program
- engrave_program_action_set(Cur.epr, action,
- param1,
- param2,
- value,
- value2
- );
+ //engrave_program_action_set(Cur.epr, action,
+ // param1,
+ // param2,
+ // value,
+ // value2
+ //);
- if (action == ENGRAVE_ACTION_SIGNAL_EMIT)
+ if (action == EDJE_ACTION_TYPE_SIGNAL_EMIT)
{
etk_widget_hide(UI_TargetEntry);
etk_widget_hide(UI_TargetLabel);
etk_widget_hide(UI_TransiComboBox);
etk_widget_hide(UI_TransiLabel);
etk_widget_hide(UI_DurationSpinner);
- etk_widget_hide(UI_DurationLabel);
etk_widget_show(UI_Param1Entry);
etk_widget_show(UI_Param1Label);
etk_label_set(ETK_LABEL(UI_Param1Label), "<b>Signal</b>");
+ etk_label_set(ETK_LABEL(UI_Param2Label), "<b>Source</b>");
etk_widget_hide(UI_Param1Spinner);
etk_widget_show(UI_Param2Label);
etk_widget_show(UI_Param2Entry);
}
- if (action == ENGRAVE_ACTION_STATE_SET)
+ if (action == EDJE_ACTION_TYPE_STATE_SET)
{
etk_widget_show(UI_TargetEntry);
etk_widget_show(UI_TargetLabel);
etk_widget_show(UI_TransiComboBox);
etk_widget_show(UI_TransiLabel);
etk_widget_show(UI_DurationSpinner);
- etk_widget_show(UI_DurationLabel);
etk_widget_show(UI_Param1Entry);
etk_widget_show(UI_Param1Label);
etk_label_set(ETK_LABEL(UI_Param1Label), "<b>State</b>");
etk_widget_show(UI_Param1Spinner);
etk_widget_hide(UI_Param2Label);
etk_widget_hide(UI_Param2Entry);
+ etk_widget_hide(UI_Param2Spinner);
}
- if (action == ENGRAVE_ACTION_STOP)
+ if (action == EDJE_ACTION_TYPE_ACTION_STOP)
{
etk_widget_show(UI_TargetEntry);
etk_widget_show(UI_TargetLabel);
etk_widget_hide(UI_TransiComboBox);
etk_widget_hide(UI_TransiLabel);
etk_widget_hide(UI_DurationSpinner);
- etk_widget_hide(UI_DurationLabel);
etk_widget_hide(UI_Param1Entry);
etk_widget_hide(UI_Param1Label);
etk_widget_hide(UI_Param1Spinner);
etk_widget_hide(UI_Param2Label);
etk_widget_hide(UI_Param2Entry);
+ etk_widget_hide(UI_Param2Spinner);
+ }
+ if (action == EDJE_ACTION_TYPE_NONE ||
+ action == EDJE_ACTION_TYPE_SCRIPT)
+ {
+ etk_widget_hide(UI_TargetEntry);
+ etk_widget_hide(UI_TargetLabel);
+ etk_widget_hide(UI_TransiComboBox);
+ etk_widget_hide(UI_TransiLabel);
+ etk_widget_hide(UI_DurationSpinner);
+ etk_widget_hide(UI_Param1Entry);
+ etk_widget_hide(UI_Param1Label);
+ etk_widget_hide(UI_Param1Spinner);
+ etk_widget_hide(UI_Param2Label);
+ etk_widget_hide(UI_Param2Entry);
+ etk_widget_hide(UI_Param2Spinner);
+ }
+ if (action == EDJE_ACTION_TYPE_DRAG_VAL_SET ||
+ action == EDJE_ACTION_TYPE_DRAG_VAL_STEP ||
+ action == EDJE_ACTION_TYPE_DRAG_VAL_PAGE)
+ {
+ etk_widget_hide(UI_TargetEntry);
+ etk_widget_hide(UI_TargetLabel);
+ etk_widget_hide(UI_TransiComboBox);
+ etk_widget_hide(UI_TransiLabel);
+ etk_widget_hide(UI_DurationSpinner);
+ etk_label_set(ETK_LABEL(UI_Param1Label), "<b>? ? ? ?</b>");
+ etk_label_set(ETK_LABEL(UI_Param2Label), "<b>? ? ? ?</b>");
+ etk_widget_hide(UI_Param1Entry);
+ etk_widget_show(UI_Param1Label);
+ etk_widget_show(UI_Param1Spinner);
+ etk_widget_show(UI_Param2Label);
+ etk_widget_hide(UI_Param2Entry);
+ etk_widget_show(UI_Param2Spinner);
}
return ETK_TRUE;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- evas.c 15 Feb 2008 21:41:21 -0000 1.26
+++ evas.c 16 Feb 2008 16:53:00 -0000 1.27
@@ -376,8 +376,7 @@
int x, y, w, h;
//printf("DRAW ALL\n");
- //printf("PART: %s\n", Cur.part->string);
- if (etk_string_length_get(Cur.part))
+ if (etk_string_length_get(Cur.group))
{
//Get the geometry of ETK_canvas
//evas_object_geometry_get(EV_canvas_bg,&x,&y,&w,&h);
@@ -395,18 +394,23 @@
evas_object_raise(EV_movebox);
// evas_object_raise(focus_handler);
- ev_draw_focus();
-
+ if (etk_string_length_get(Cur.part))
+ {
+ ev_draw_focus();
+ return;
+ }
+
}else
{
evas_object_hide(engrave_canvas);
evas_object_hide(EV_fakewin);
evas_object_hide(EV_movebox);
- evas_object_hide(rel1X_parent_handler);
- evas_object_hide(rel1Y_parent_handler);
- evas_object_hide(rel2X_parent_handler);
- evas_object_hide(rel2Y_parent_handler);
- evas_object_hide(rel1_handler);
- evas_object_hide(rel2_handler);
}
+ evas_object_hide(rel1X_parent_handler);
+ evas_object_hide(rel1Y_parent_handler);
+ evas_object_hide(rel2X_parent_handler);
+ evas_object_hide(rel2Y_parent_handler);
+ evas_object_hide(rel1_handler);
+ evas_object_hide(rel2_handler);
+ evas_object_hide(focus_handler);
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- interface.c 16 Feb 2008 01:22:21 -0000 1.55
+++ interface.c 16 Feb 2008 16:53:00 -0000 1.56
@@ -855,6 +855,11 @@
void
UpdateProgFrame(void)
{
+ const char *s;
+ Evas_List *l;
+
+ if (!etk_string_length_get(Cur.prog)) return;
+
//Stop signal propagation
etk_signal_block("text-changed", ETK_OBJECT(UI_ProgramEntry),
ETK_CALLBACK(on_ProgramEntry_text_changed), NULL);
@@ -882,84 +887,95 @@
etk_signal_block("text-changed", ETK_OBJECT(UI_Param2Entry),
ETK_CALLBACK(on_Param2Entry_text_changed), NULL);
- const char *s;
+
+ etk_widget_disabled_set(UI_AfterEntry, TRUE);
+ etk_widget_disabled_set(UI_ProgramEntry, TRUE);
+ etk_widget_disabled_set(UI_SourceEntry, TRUE);
+ etk_widget_disabled_set(UI_SignalEntry, TRUE);
+ etk_widget_disabled_set(UI_DelayFromSpinner, TRUE);
+ etk_widget_disabled_set(UI_DelayRangeSpinner, TRUE);
+ etk_widget_disabled_set(UI_TargetEntry, TRUE);
+ etk_widget_disabled_set(UI_Param1Entry, TRUE);
+ etk_widget_disabled_set(UI_Param2Entry, TRUE);
+ etk_widget_disabled_set(UI_Param1Spinner, TRUE);
+ etk_widget_disabled_set(UI_Param2Spinner, TRUE);
+ etk_widget_disabled_set(UI_DurationSpinner, TRUE);
- if (!etk_string_length_get(Cur.prog)) return; //TODO place before
signal_blocks
//Update Program
- etk_entry_text_set(ETK_ENTRY(UI_ProgramEntry),Cur.prog->string);
+ etk_entry_text_set(ETK_ENTRY(UI_ProgramEntry), Cur.prog->string);
//Update Source
s = edje_edit_program_source_get(edje_o, Cur.prog->string);
-
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),s);
+ etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(
+ ETK_COMBOBOX_ENTRY(UI_SourceEntry))),s);
edje_edit_string_free(s);
- printf("-----------\n");
+
//Update Signal
s = edje_edit_program_signal_get(edje_o, Cur.prog->string);
etk_entry_text_set(ETK_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));
etk_range_value_set(ETK_RANGE(UI_DelayRangeSpinner),
- edje_edit_program_in_range_get(edje_o,
Cur.prog->string));
+ edje_edit_program_in_range_get(edje_o,
Cur.prog->string));
//Update Action
- /* if (Cur.epr->action == ENGRAVE_ACTION_SIGNAL_EMIT)
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_ActionComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ActionComboBox),2));
- if (Cur.epr->action == ENGRAVE_ACTION_STATE_SET)
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_ActionComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ActionComboBox),0));
- if (Cur.epr->action == ENGRAVE_ACTION_STOP)
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_ActionComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ActionComboBox),1));
+ int action;
+ action = edje_edit_program_action_get(edje_o, Cur.prog->string);
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_ActionComboBox),
+ etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ActionComboBox),action));
+
//Update Target(s)
- Evas_List *tl; //target list
- Etk_String *str=etk_string_new("");
- for (tl = Cur.epr->targets; tl; tl = tl->next)
+ Etk_String *str = etk_string_new("");
+ l = edje_edit_program_targets_get(edje_o, Cur.prog->string);
+ for (; l; l = l->next)
{
- str = etk_string_append(str,tl->data);
- str = etk_string_append(str,", ");
+ str = etk_string_append(str, l->data);
+ str = etk_string_append(str, ", ");
}
if (str->length > 2)
- etk_string_truncate(str, str->length - 2);
+ str = etk_string_truncate(str, str->length - 2);
etk_entry_text_set(ETK_ENTRY(UI_TargetEntry),str->string);
-
- //Update Param1/2
- etk_entry_text_set(ETK_ENTRY(UI_Param1Entry),Cur.epr->state);
- etk_entry_text_set(ETK_ENTRY(UI_Param2Entry),Cur.epr->state2);
- etk_range_value_set(ETK_RANGE(UI_Param1Spinner), Cur.epr->value);
-
- //Update Transition
- if (Cur.epr->transition== ENGRAVE_TRANSITION_LINEAR)
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_TransiComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_TransiComboBox),0));
- if (Cur.epr->transition == ENGRAVE_TRANSITION_SINUSOIDAL)
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_TransiComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_TransiComboBox),1));
- if (Cur.epr->transition == ENGRAVE_TRANSITION_ACCELERATE)
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_TransiComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_TransiComboBox),2));
- if (Cur.epr->transition == ENGRAVE_TRANSITION_DECELERATE)
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_TransiComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_TransiComboBox),3));
- etk_range_value_set(ETK_RANGE(UI_DurationSpinner), Cur.epr->duration);
-
+
//Update Afters(s)
- etk_string_truncate(str,0);
- for (tl = Cur.epr->afters; tl; tl = tl->next)
+ str = etk_string_clear(str);
+ l = edje_edit_program_afters_get(edje_o, Cur.prog->string);
+ for (; l; l = l->next)
{
- str = etk_string_append(str,tl->data);
+ str = etk_string_append(str,l->data);
str = etk_string_append(str,", ");
}
if (str->length > 2)
- etk_string_truncate (str, str->length - 2);
+ str = etk_string_truncate(str, str->length - 2);
etk_entry_text_set(ETK_ENTRY(UI_AfterEntry),str->string);
- etk_object_destroy(ETK_OBJECT(str));*/
+
+ //Update state & state value
+ s = edje_edit_program_state_get(edje_o, Cur.prog->string);
+ etk_entry_text_set(ETK_ENTRY(UI_Param1Entry),s);
+ etk_range_value_set(ETK_RANGE(UI_Param1Spinner),
+ edje_edit_program_value_get(edje_o, Cur.prog->string));
+ edje_edit_string_free(s);
+
+ s = edje_edit_program_state2_get(edje_o, Cur.prog->string);
+ etk_entry_text_set(ETK_ENTRY(UI_Param2Entry),s);
+ 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),
+ edje_edit_program_transition_get(edje_o, Cur.prog->string)-1));
+
+ //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(on_ProgramEntry_text_changed), NULL);
@@ -986,6 +1002,8 @@
ETK_CALLBACK(on_AfterEntry_text_changed), NULL);
etk_signal_unblock("text-changed", ETK_OBJECT(UI_Param2Entry),
ETK_CALLBACK(on_Param2Entry_text_changed), NULL);
+
+ etk_object_destroy(ETK_OBJECT(str));
}
void
@@ -2152,7 +2170,7 @@
Etk_Widget *label;
//table
- table = etk_table_new(4, 10, ETK_TABLE_NOT_HOMOGENEOUS);
+ table = etk_table_new(4, 10, ETK_TABLE_HHOMOGENEOUS);
//UI_ProgramEntry
label = etk_label_new("<b>Name</b>");
@@ -2185,16 +2203,16 @@
etk_table_attach(ETK_TABLE(table), label, 0, 0, 3, 3,ETK_TABLE_NONE,0,0);
UI_DelayFromSpinner = etk_spinner_new(0.0, 999.0, 0.0, 0.1, 1.0);
etk_tooltips_tip_set(UI_DelayFromSpinner, "The number of seconds to wait
before running the program");
- etk_spinner_digits_set(ETK_SPINNER(UI_DelayFromSpinner), 1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_DelayFromSpinner), 3);
etk_widget_size_request_set(UI_DelayFromSpinner,45, 20);
etk_table_attach_default(ETK_TABLE(table),UI_DelayFromSpinner, 1, 1, 3, 3);
//UI_DelayRangeSpinner
- label = etk_label_new("<b> + random</b>");
+ label = etk_label_new("<b>+random</b>");
etk_table_attach(ETK_TABLE(table), label, 2, 2, 3, 3,ETK_TABLE_NONE,0,0);
UI_DelayRangeSpinner = etk_spinner_new(0.0, 999.0, 0.0, 0.1, 1.0);
etk_tooltips_tip_set(UI_DelayRangeSpinner, "The maximum <b>random</b>
seconds which is added to <b>Delay</b>");
- etk_spinner_digits_set(ETK_SPINNER(UI_DelayRangeSpinner), 1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_DelayRangeSpinner), 3);
etk_widget_size_request_set(UI_DelayRangeSpinner,45, 20);
etk_table_attach_default(ETK_TABLE(table),UI_DelayRangeSpinner, 3, 3, 3, 3);
@@ -2216,18 +2234,46 @@
etk_combobox_column_add(ETK_COMBOBOX(UI_ActionComboBox),
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, ENGRAVE_ACTION_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*)ENGRAVE_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),
- (void*)ENGRAVE_ACTION_SIGNAL_EMIT);
- etk_table_attach_default(ETK_TABLE(table),UI_ActionComboBox, 1, 3, 5, 5);
+ (void*)EDJE_ACTION_TYPE_SIGNAL_EMIT);
+
+ item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
+ 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),
+ (void*)EDJE_ACTION_TYPE_DRAG_VAL_PAGE);
+ item = etk_combobox_item_append(ETK_COMBOBOX(UI_ActionComboBox),
+ 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);
@@ -2245,7 +2291,7 @@
//Param1Spinner
UI_Param1Spinner = etk_spinner_new(0.0, 1.0, 0.0, 0.1, 1.0);
etk_tooltips_tip_set(UI_Param1Spinner, "Description to set in the specified
targets");
- etk_spinner_digits_set(ETK_SPINNER(UI_Param1Spinner), 1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_Param1Spinner), 2);
etk_widget_size_request_set(UI_Param1Spinner,45, 20);
etk_table_attach_default(ETK_TABLE(table),UI_Param1Spinner, 3, 3, 7, 7);
@@ -2259,26 +2305,29 @@
etk_combobox_column_add(ETK_COMBOBOX(UI_TransiComboBox),
ETK_COMBOBOX_LABEL, 75, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_TransiComboBox));
+ etk_table_attach_default(ETK_TABLE(table),UI_TransiComboBox, 1, 2, 8, 8);
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Linear");
- etk_combobox_item_data_set(item, ENGRAVE_TRANSITION_LINEAR);
+ etk_combobox_item_data_set(item, (void*)EDJE_TWEEN_MODE_LINEAR);
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Sinusoidal");
- etk_combobox_item_data_set(item, (void*)ENGRAVE_TRANSITION_SINUSOIDAL);
+ etk_combobox_item_data_set(item, (void*)EDJE_TWEEN_MODE_SINUSOIDAL);
+
item = etk_combobox_item_append(ETK_COMBOBOX(UI_TransiComboBox),
etk_image_new_from_edje(EdjeFile,"DESC.PNG"), "Accelerate");
- etk_combobox_item_data_set(item, (void*)ENGRAVE_TRANSITION_ACCELERATE);
+ etk_combobox_item_data_set(item, (void*)EDJE_TWEEN_MODE_ACCELERATE);
+
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*)ENGRAVE_TRANSITION_DECELERATE);
- etk_table_attach_default(ETK_TABLE(table),UI_TransiComboBox, 1, 1, 8, 8);
+ etk_combobox_item_data_set(item, (void*)EDJE_TWEEN_MODE_DECELERATE);
+
//DurationSpinner
- UI_DurationLabel = etk_label_new("<b>seconds</b>");
- etk_table_attach(ETK_TABLE(table), UI_DurationLabel, 2, 2, 8,
8,ETK_TABLE_NONE,0,0);
UI_DurationSpinner = etk_spinner_new(0.0, 999.0, 0.0, 0.1, 1.0);
etk_tooltips_tip_set(UI_DurationSpinner, "The duration of the transition.
In seconds.");
- etk_spinner_digits_set(ETK_SPINNER(UI_DurationSpinner), 1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_DurationSpinner), 3);
etk_widget_size_request_set(UI_DurationSpinner,45, 20);
etk_table_attach_default(ETK_TABLE(table),UI_DurationSpinner, 3, 3, 8, 8);
@@ -2288,6 +2337,13 @@
UI_Param2Entry = etk_entry_new();
etk_tooltips_tip_set(UI_Param2Entry, "!!!!!!");
etk_table_attach_default(ETK_TABLE(table), UI_Param2Entry, 1, 2, 9, 9);
+
+ //Param2Spinner
+ UI_Param2Spinner = etk_spinner_new(0.0, 1.0, 0.0, 0.1, 1.0);
+ etk_tooltips_tip_set(UI_Param2Spinner, "Used for drag operation");
+ etk_spinner_digits_set(ETK_SPINNER(UI_Param2Spinner), 2);
+ etk_widget_size_request_set(UI_Param2Spinner,45, 20);
+ 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);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- interface.h 16 Feb 2008 01:22:21 -0000 1.26
+++ interface.h 16 Feb 2008 16:53:00 -0000 1.27
@@ -100,7 +100,6 @@
Etk_Widget *UI_TransiComboBox;
Etk_Widget *UI_TransiLabel;
Etk_Widget *UI_DurationSpinner;
-Etk_Widget *UI_DurationLabel;
Etk_Widget *UI_AfterEntry;
Etk_Widget *UI_SourceEntry;
Etk_Widget *UI_TargetEntry;
@@ -110,6 +109,7 @@
Etk_Widget *UI_Param1Spinner;
Etk_Widget *UI_Param1Label;
Etk_Widget *UI_Param2Entry;
+Etk_Widget *UI_Param2Spinner;
Etk_Widget *UI_Param2Label;
Etk_Widget *UI_DelayFromSpinner;
Etk_Widget *UI_DelayRangeSpinner;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- main.h 16 Feb 2008 01:22:21 -0000 1.25
+++ main.h 16 Feb 2008 16:53:00 -0000 1.26
@@ -137,10 +137,13 @@
/* GLOBALS */
int FileChooserOperation; //The current file chooser operation
(FILECHOOSER_OPEN,FILECHOOSER_NEW etc)
char *EdjeFile; //The filename of the edje_editor.edj
file (witch contain all the graphics used by the program)
+Evas_Object *edje_o; //The edje object we are editing
+Evas_Hash *Parts_Hash; //Associate part names with
Etk_Tree_Row*
+Ecore_Hash *hash; //Associate the engrave objects with
the tree_rows
Evas_Object *engrave_canvas; //The engrave canvas
-Evas_Object *EV_fakewin; //The simple window implementation
+Evas_Object *EV_fakewin; //The simple window implementation
Evas_Object *EV_movebox; // FIXME
Evas_Object *focus_handler; //The yellow box around the selected
part
Evas_Object *rel1_handler; //The red point
@@ -149,11 +152,11 @@
Evas_Object *rel1Y_parent_handler; //
Evas_Object *rel2X_parent_handler; //
Evas_Object *rel2Y_parent_handler; //
-Ecore_Hash *hash; //Associate the engrave objects with
the tree_rows
/* FUNCTION PROTOTYPES*/
void DebugInfo(int full);
int LoadEDJ(char *file);
+void ChangeGroup(char *group);
//This define is copied from edje_private.h (find a way to export it)
@@ -180,11 +183,21 @@
#define EDJE_TEXT_EFFECT_GLOW 10
#define EDJE_TEXT_EFFECT_LAST 11
-Evas_Object *edje_o;
-Evas_Hash *Parts_Hash;
-
-
-void ChangeGroup(char *group);
-
+#define EDJE_ACTION_TYPE_NONE 0
+#define EDJE_ACTION_TYPE_STATE_SET 1
+#define EDJE_ACTION_TYPE_ACTION_STOP 2
+#define EDJE_ACTION_TYPE_SIGNAL_EMIT 3
+#define EDJE_ACTION_TYPE_DRAG_VAL_SET 4
+#define EDJE_ACTION_TYPE_DRAG_VAL_STEP 5
+#define EDJE_ACTION_TYPE_DRAG_VAL_PAGE 6
+#define EDJE_ACTION_TYPE_SCRIPT 7
+#define EDJE_ACTION_TYPE_LAST 8
+
+#define EDJE_TWEEN_MODE_NONE 0
+#define EDJE_TWEEN_MODE_LINEAR 1
+#define EDJE_TWEEN_MODE_SINUSOIDAL 2
+#define EDJE_TWEEN_MODE_ACCELERATE 3
+#define EDJE_TWEEN_MODE_DECELERATE 4
+#define EDJE_TWEEN_MODE_LAST 5
#endif // INCLUSION_GUARD
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
