Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c interface.c interface.h main.c main.h
Log Message:
* add/remove tween frame
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- callbacks.c 15 Feb 2008 21:41:21 -0000 1.47
+++ callbacks.c 16 Feb 2008 01:22:20 -0000 1.48
@@ -62,6 +62,9 @@
{
char cmd[1024];
Etk_String *text;
+ char *tween;
+ Etk_Tree_Row *row, *next;
+ Etk_Combobox_Item *item;
switch ((int)data)
{
@@ -112,8 +115,42 @@
ShowFilechooser(FILECHOOSER_FONT);
//ShowAlert("Not yet reimplemented ;)");
break;
+ case IMAGE_TWEEN_ADD:
+ item = etk_combobox_active_item_get(ETK_COMBOBOX(UI_ImageComboBox));
+ tween = etk_combobox_item_field_get(item, 1);
+ if (!tween)
+ {
+ ShowAlert("You must choose an image to add from the combobox below");
+ }
+
+ if(edje_edit_state_tween_add(edje_o, Cur.part->string,
Cur.state->string, tween))
+ {
+ PupulateTweenList();
+ row = etk_tree_last_row_get(ETK_TREE(UI_ImageTweenList));
+ etk_tree_row_select(row);
+ etk_tree_row_scroll_to(row, ETK_FALSE);
+ }
+ break;
case IMAGE_TWEEN_DELETE:
- ShowAlert("Not yet reimplemented ;)");
+ //TODO delete the correct tween (not the first with that name)
+ if (!etk_string_length_get(Cur.tween)) break;
+ printf("REMOVE TWEEN %s\n", Cur.tween->string);
+ edje_edit_state_tween_del(edje_o, Cur.part->string, Cur.state->string,
+ Cur.tween->string);
+ row = etk_tree_selected_row_get(ETK_TREE(UI_ImageTweenList));
+ next = etk_tree_row_next_get(row);
+ if (!next)
+ next = etk_tree_row_prev_get(row);
+ if (next)
+ etk_tree_row_select(next);
+ else
+ {
+ Cur.tween = etk_string_clear(Cur.tween);
+ etk_widget_disabled_set(UI_DeleteTweenButton, TRUE);
+ etk_widget_disabled_set(UI_MoveDownTweenButton, TRUE);
+ etk_widget_disabled_set(UI_MoveUpTweenButton, TRUE);
+ }
+ etk_tree_row_delete(row);
break;
case TOOLBAR_OPTIONS:
etk_menu_popup(ETK_MENU(UI_OptionsMenu));
@@ -152,8 +189,8 @@
//on_RemoveMenu_item_activated(NULL, REMOVE_PART);
//on_AddMenu_item_activated(NULL, NEW_RECT);
//PopulateGroupsComboBox();
- ChangeGroup("New group");
- //DebugInfo(FALSE);
+ //ChangeGroup("New group");
+ DebugInfo(FALSE);
break;
case IMAGE_TWEEN_UP:
ShowAlert("Up not yet implemented.");
@@ -204,6 +241,7 @@
case ROW_PART:
Cur.part = etk_string_set(Cur.part, name);
Cur.state = etk_string_clear(Cur.state);
+ Cur.tween = etk_string_clear(Cur.tween);
edje_object_signal_emit(edje_ui,"description_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"position_frame_hide","edje_editor");
@@ -221,6 +259,7 @@
case ROW_DESC:
Cur.state = etk_string_set(Cur.state, name);
Cur.part = etk_string_set(Cur.part, parent_name);
+ Cur.tween = etk_string_clear(Cur.tween);
edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string);
@@ -262,6 +301,7 @@
Cur.prog = etk_string_set(Cur.prog, name);
Cur.part = etk_string_clear(Cur.part);
Cur.state = etk_string_clear(Cur.state);
+ Cur.tween = etk_string_clear(Cur.tween);
edje_object_signal_emit(edje_ui,"description_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"position_frame_hide","edje_editor");
@@ -549,6 +589,19 @@
Etk_Bool
on_ImageTweenList_row_selected(Etk_Object *object, Etk_Tree_Row *row, void
*data)
{
+ Etk_Tree_Col *col;
+ char *selected = NULL;
+ printf("Row selected signal on ImageTweenList EMITTED\n");
+
+ col = etk_tree_nth_col_get(ETK_TREE(UI_ImageTweenList), 0);
+ etk_tree_row_fields_get(row, col, NULL, NULL, &selected, NULL);
+ if (!selected) return ETK_TRUE;
+
+ Cur.tween = etk_string_set(Cur.tween, selected);
+ etk_widget_disabled_set(UI_DeleteTweenButton, FALSE);
+ // etk_widget_disabled_set(UI_MoveDownTweenButton, FALSE);
+ // etk_widget_disabled_set(UI_MoveUpTweenButton, FALSE);
+
return ETK_TRUE;
}
@@ -1456,13 +1509,21 @@
break;
}
PopulateImagesComboBox();
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_ImageComboBox),
+ etk_combobox_last_item_get(ETK_COMBOBOX(UI_ImageComboBox)));
break;
case FILECHOOSER_FONT:
snprintf(cmd, 4096, "%s/%s",
etk_filechooser_widget_current_folder_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
- if (edje_edit_font_add(edje_o, cmd))
- PopulateFontsComboBox();
+ if (!edje_edit_font_add(edje_o, cmd))
+ {
+ ShowAlert("ERROR: Can't import font file.");
+ break;
+ }
+ PopulateFontsComboBox();
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_FontComboBox),
+ etk_combobox_last_item_get(ETK_COMBOBOX(UI_FontComboBox)));
break;
}
etk_widget_hide(ETK_WIDGET(dialog));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- interface.c 15 Feb 2008 22:12:01 -0000 1.54
+++ interface.c 16 Feb 2008 01:22:21 -0000 1.55
@@ -221,7 +221,6 @@
Etk_Combobox_Item *ComboItem;
char buf[4096];
-
//Stop signal propagation
etk_signal_block("item-activated", ETK_OBJECT(UI_ImageComboBox),
ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
@@ -360,13 +359,14 @@
{
Evas_List *tweens, *l;
Etk_Tree_Col *col;
- col = etk_tree_nth_col_get(ETK_TREE(UI_ImageTweenList), 0);
-
- etk_tree_clear(ETK_TREE(UI_ImageTweenList));
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
+ col = etk_tree_nth_col_get(ETK_TREE(UI_ImageTweenList), 0);
+
+ etk_tree_clear(ETK_TREE(UI_ImageTweenList));
+
tweens = l = edje_edit_state_tweens_list_get(edje_o, Cur.part->string,
Cur.state->string);
while (l)
{
@@ -547,8 +547,10 @@
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
-
PupulateTweenList();
+ etk_widget_disabled_set(UI_DeleteTweenButton, TRUE);
+ etk_widget_disabled_set(UI_MoveDownTweenButton, TRUE);
+ etk_widget_disabled_set(UI_MoveUpTweenButton, TRUE);
//Set the images combobox for normal image
pi = edje_edit_state_image_get(edje_o, Cur.part->string, Cur.state->string);
@@ -1598,7 +1600,7 @@
Etk_Tree_Col *col1;
//table
- table = etk_table_new(5, 8, ETK_TABLE_NOT_HOMOGENEOUS);
+ table = etk_table_new(5, 4, ETK_TABLE_NOT_HOMOGENEOUS);
//imageComboBox
UI_ImageComboBox = etk_combobox_new();
@@ -1607,16 +1609,32 @@
etk_combobox_column_add(ETK_COMBOBOX(UI_ImageComboBox),
ETK_COMBOBOX_LABEL, 75, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_ImageComboBox));
- etk_table_attach_default(ETK_TABLE(table),UI_ImageComboBox, 0, 3, 1, 1);
+ etk_table_attach_default(ETK_TABLE(table),UI_ImageComboBox, 0, 3, 0, 0);
//AddImageButton
UI_ImageAddButton = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
etk_object_properties_set(ETK_OBJECT(UI_ImageAddButton), "label","",NULL);
- etk_table_attach_default(ETK_TABLE(table),UI_ImageAddButton, 4, 4, 1, 1);
+ etk_table_attach_default(ETK_TABLE(table),UI_ImageAddButton, 4, 4, 0, 0);
//ImageTweenVBox
- UI_ImageTweenVBox = etk_vbox_new(ETK_TRUE, 2);
- etk_table_attach_default(ETK_TABLE(table),UI_ImageTweenVBox, 0, 0, 2, 2);
+ UI_ImageTweenVBox = etk_vbox_new(ETK_TRUE, 0);
+ etk_table_attach_default(ETK_TABLE(table),UI_ImageTweenVBox, 0, 0, 1, 1);
+
+ //AddTweenButton
+ UI_AddTweenButton = etk_button_new_from_stock(ETK_STOCK_LIST_ADD);
+ etk_button_style_set(ETK_BUTTON(UI_AddTweenButton), ETK_BUTTON_ICON);
+ etk_signal_connect("clicked", ETK_OBJECT(UI_AddTweenButton),
+ ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_ADD);
+ etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_AddTweenButton,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+
+ //DeleteTweenButton
+ UI_DeleteTweenButton = etk_button_new_from_stock(ETK_STOCK_EDIT_DELETE);
+ etk_button_style_set(ETK_BUTTON(UI_DeleteTweenButton), ETK_BUTTON_ICON);
+ etk_signal_connect("clicked", ETK_OBJECT(UI_DeleteTweenButton),
+ ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_DELETE);
+ etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_DeleteTweenButton,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//MoveUpTweenButton
UI_MoveUpTweenButton = etk_button_new_from_stock(ETK_STOCK_GO_UP);
@@ -1633,15 +1651,7 @@
ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_DOWN);
etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_MoveDownTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
-
- //DeleteTweenButton
- UI_DeleteTweenButton = etk_button_new_from_stock(ETK_STOCK_EDIT_DELETE);
- etk_button_style_set(ETK_BUTTON(UI_DeleteTweenButton), ETK_BUTTON_ICON);
- etk_signal_connect("clicked", ETK_OBJECT(UI_DeleteTweenButton),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_DELETE);
- etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_DeleteTweenButton,
- ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
-
+
//ImageTweenList
UI_ImageTweenList = etk_tree_new();
etk_tree_mode_set(ETK_TREE(UI_ImageTweenList), ETK_TREE_MODE_LIST);
@@ -1651,59 +1661,55 @@
etk_tree_col_model_add(col1, etk_tree_model_image_new());
etk_tree_col_model_add(col1, etk_tree_model_text_new());
etk_tree_build(ETK_TREE(UI_ImageTweenList));
- etk_table_attach_default(ETK_TABLE(table),UI_ImageTweenList, 1, 4, 2, 2);
+ etk_table_attach_default(ETK_TABLE(table),UI_ImageTweenList, 1, 4, 1, 1);
label = etk_label_new("Alpha");
- etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 3, 3);
+ etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 2, 2);
//ImageAlphaSlider
UI_ImageAlphaSlider = etk_hslider_new(0, 255, 15, 1,20);
- etk_table_attach_default(ETK_TABLE(table),UI_ImageAlphaSlider, 1, 4, 3, 3);
+ etk_table_attach_default(ETK_TABLE(table),UI_ImageAlphaSlider, 1, 4, 2, 2);
label = etk_label_new("Left");
etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default(ETK_TABLE(table),label, 1, 1, 4, 4);
+ etk_table_attach_default(ETK_TABLE(table),label, 1, 1, 3, 3);
label = etk_label_new("Right");
etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default(ETK_TABLE(table),label, 2, 2, 4, 4);
+ etk_table_attach_default(ETK_TABLE(table),label, 2, 2, 3, 3);
label = etk_label_new("Top");
etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default(ETK_TABLE(table),label, 3, 3, 4, 4);
+ etk_table_attach_default(ETK_TABLE(table),label, 3, 3, 3, 3);
label = etk_label_new("Bottom");
etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default(ETK_TABLE(table),label, 4, 4, 4, 4);
+ etk_table_attach_default(ETK_TABLE(table),label, 4, 4, 3, 3);
label = etk_label_new("Border");
//etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 5, 5);
+ etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 4, 4);
//UI_BorderLeftSpinner
UI_BorderLeftSpinner = etk_spinner_new(0, 500, 0, 1, 10);
etk_widget_size_request_set(UI_BorderLeftSpinner,45, 20);
- etk_table_attach_default(ETK_TABLE(table),UI_BorderLeftSpinner, 1, 1, 5, 5);
+ etk_table_attach_default(ETK_TABLE(table),UI_BorderLeftSpinner, 1, 1, 4, 4);
//UI_BorderRightSpinner
UI_BorderRightSpinner = etk_spinner_new(0, 500, 0, 1, 10);
etk_widget_size_request_set(UI_BorderRightSpinner,45, 20);
- etk_table_attach_default(ETK_TABLE(table),UI_BorderRightSpinner, 2, 2, 5,
5);
+ etk_table_attach_default(ETK_TABLE(table),UI_BorderRightSpinner, 2, 2, 4,
4);
//UI_BorderTopSpinner
UI_BorderTopSpinner = etk_spinner_new(0, 500, 0, 1, 10);
etk_widget_size_request_set(UI_BorderTopSpinner,45, 20);
- etk_table_attach_default(ETK_TABLE(table),UI_BorderTopSpinner, 3, 3, 5, 5);
+ etk_table_attach_default(ETK_TABLE(table),UI_BorderTopSpinner, 3, 3, 4, 4);
//UI_BorderBottomSpinner
UI_BorderBottomSpinner = etk_spinner_new(0, 500, 0, 1, 10);
etk_widget_size_request_set(UI_BorderBottomSpinner,45, 20);
- etk_table_attach_default(ETK_TABLE(table),UI_BorderBottomSpinner, 4, 4, 5,
5);
+ etk_table_attach_default(ETK_TABLE(table),UI_BorderBottomSpinner, 4, 4, 4,
4);
- etk_signal_connect("clicked", ETK_OBJECT(UI_ImageNormalRadio),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_NORMAL_RADIO);
- etk_signal_connect("clicked", ETK_OBJECT(UI_ImageTweenRadio),
- ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_RADIO);
etk_signal_connect("row-selected", ETK_OBJECT(UI_ImageTweenList),
ETK_CALLBACK(on_ImageTweenList_row_selected), NULL);
etk_signal_connect("clicked", ETK_OBJECT(UI_ImageAddButton),
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- interface.h 15 Feb 2008 21:41:21 -0000 1.25
+++ interface.h 16 Feb 2008 01:22:21 -0000 1.26
@@ -65,11 +65,10 @@
Etk_Widget *UI_AspectComboBox;
/* image frame objects */
Etk_Widget *UI_ImageTweenList;
-Etk_Widget *UI_ImageTweenRadio;
-Etk_Widget *UI_ImageNormalRadio;
Etk_Widget *UI_ImageComboBox;
Etk_Widget *UI_ImageTweenVBox;
Etk_Widget *UI_ImageAlphaSlider;
+Etk_Widget *UI_AddTweenButton;
Etk_Widget *UI_DeleteTweenButton;
Etk_Widget *UI_MoveDownTweenButton;
Etk_Widget *UI_MoveUpTweenButton;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- main.c 15 Feb 2008 21:41:21 -0000 1.28
+++ main.c 16 Feb 2008 01:22:21 -0000 1.29
@@ -58,6 +58,10 @@
printf(" ** Cur program: %s\n",Cur.prog->string);
else
printf(" ** Cur program: (NULL)\n");
+ if (etk_string_length_get(Cur.tween))
+ printf(" ** Cur tween: %s\n",Cur.tween->string);
+ else
+ printf(" ** Cur tween: (NULL)\n");
printf(" *********************** Parts_Hash
*****************************\n");
evas_hash_foreach(Parts_Hash, _DebugInfo_helper, NULL);
printf(" *********************** E N D *****************************\n\n");
@@ -225,6 +229,7 @@
Cur.part = etk_string_clear(Cur.part);
Cur.state = etk_string_clear(Cur.state);
Cur.prog = etk_string_clear(Cur.prog);
+ Cur.tween = etk_string_clear(Cur.tween);
Parts_Hash = NULL;
PopulateGroupsComboBox();
@@ -324,6 +329,7 @@
Cur.part = etk_string_new("");
Cur.state = etk_string_new("");
Cur.prog = etk_string_new("");
+ Cur.tween = etk_string_new("");
//Open a file from command line
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- main.h 15 Feb 2008 22:12:01 -0000 1.24
+++ main.h 16 Feb 2008 01:22:21 -0000 1.25
@@ -104,9 +104,8 @@
REL_COMBO_INTERFACE,
IMAGE_TWEEN_UP,
IMAGE_TWEEN_DOWN,
+ IMAGE_TWEEN_ADD,
IMAGE_TWEEN_DELETE,
- IMAGE_TWEEN_RADIO,
- IMAGE_NORMAL_RADIO,
SAVE_SCRIPT,
LOAD_WIN,
SAVE_WIN
@@ -127,6 +126,8 @@
Etk_String *part;
Etk_String *state;
Etk_String *prog;
+ Etk_String *tween;
+
Etk_String *edj_file_name;
Etk_String *edj_temp_name;
-------------------------------------------------------------------------
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
