Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c callbacks.h evas.c evas.h inout.c inout.h
interface.c interface.h main.c main.h
Log Message:
* Removed engrave version (too much #ifdefine to menage)
NOW YOU MUST PATCH EDJE TO COMPILE
* the edje_edit.patch is now included in cvs (no more need of
bugzilla)
* add/remove/rename of groups
* add/remove/rename of parts
* add/remove/rename of states
* add fonts
* add blank.edc (the template for every new edje)
* reenable fakewin movement
* some indentation to fit 80 col
* some indentation to be more efl style
* some general cleanups
* comment out all of inout.c (don't need anymore)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- callbacks.c 7 Feb 2008 17:29:53 -0000 1.46
+++ callbacks.c 15 Feb 2008 21:41:21 -0000 1.47
@@ -1,5 +1,6 @@
#include <string.h>
#include <Edje.h>
+#include <Edje_Edit.h>
#include <Etk.h>
#include <Ecore_Evas.h>
#include "callbacks.h"
@@ -8,20 +9,8 @@
#include "main.h"
#include "evas.h"
-#if TEST_DIRECT_EDJE
- #include <Edje_Edit.h>
-#endif
-
-extern void PROTO_engrave_part_state_remove(Engrave_Part *ep, Engrave_Part_State *eps);
-extern void PROTO_engrave_group_part_remove(Engrave_Group *eg, Engrave_Part *ep);
-extern void PROTO_engrave_file_group_remove(Engrave_File *ef, Engrave_Group *eg);
-extern void PROTO_engrave_part_state_image_tween_remove_nth(Engrave_Part_State *eps,int tween_num);
-extern void PROTO_engrave_part_state_image_tween_remove_all(Engrave_Part_State *eps);
-extern int PROTO_engrave_part_raise(Engrave_Part *ep);
-extern int PROTO_engrave_part_lower(Engrave_Part *ep);
-extern void PROTO_engrave_group_program_remove(Engrave_Group *eg, Engrave_Program *epr);
-int current_color_object;
+static int current_color_object;
/* Called when the window is destroyed */
void
@@ -30,6 +19,24 @@
etk_main_quit();
}
+/* Called when the window is resized */
+void
+ecore_resize_callback(Ecore_Evas *ecore_evas)
+{
+ Evas_Object *embed_object;
+ int win_w, win_h;
+
+ //Get window size
+ ecore_evas_geometry_get(UI_ecore_MainWin, NULL, NULL, &win_w, &win_h);
+
+ //Resize main edje interface
+ evas_object_resize(edje_ui, win_w, win_h);
+
+ //Resize tree
+ embed_object = etk_embed_object_get(ETK_EMBED(UI_PartsTreeEmbed));
+ evas_object_move(embed_object, 0, 55);
+ evas_object_resize(embed_object, TREE_WIDTH, win_h - 55);
+}
/* Catch all the signal from the editing edje object */
void
signal_cb(void *data, Evas_Object *o, const char *sig, const char *src)
@@ -38,270 +45,159 @@
}
/* Group combobox callback */
-#if TEST_DIRECT_EDJE
Etk_Bool
on_GroupsComboBox_activated(Etk_Combobox *combobox, Etk_Combobox_Item *item, void *data)
{
char *gr;
gr = etk_combobox_item_field_get(item,0);
- printf("Group combo activated: %s\n",gr);
+ //printf("Group combo activated: %s\n",gr);
ChangeGroup(gr);
+
+ return ETK_TRUE;
}
-#endif
+
/* All the buttons Callback */
Etk_Bool
on_AllButton_click(Etk_Button *button, void *data)
{
char cmd[1024];
- Etk_Tree_Row *sel_row;
- int row_num;
Etk_String *text;
switch ((int)data)
- {
- case TOOLBAR_NEW:
- system("edje_editor &");
- break;
- case TOOLBAR_OPEN:
- //ShowAlert("Not yet implemented");
- ShowFilechooser(FILECHOOSER_OPEN);
- break;
-#if TEST_DIRECT_EDJE
- case TOOLBAR_SAVE:
- edje_edit_save(edje_o);
- if (!ecore_file_cp(Cur.edj_temp_name->string, Cur.edj_file_name->string))
- {
- ShowAlert("<b>ERROR:<\b><br>Can't write file");
- }
- break;
- case TOOLBAR_SAVE_EDC:
- ShowAlert("Not yet reimplemented ;)");
- break;
- case TOOLBAR_SAVE_EDJ:
- ShowFilechooser(FILECHOOSER_SAVE_EDJ);
- break;
- case TOOLBAR_ADD:
- ShowAlert("Not yet reimplemented ;)");
- break;
- case TOOLBAR_REMOVE:
- ShowAlert("Not yet reimplemented ;)");
- break;
- case TOOLBAR_MOVE_UP: //Lower
- ShowAlert("Not yet reimplemented ;)");
- break;
- case TOOLBAR_MOVE_DOWN: //Raise
- ShowAlert("Not yet reimplemented ;)");
- break;
- case TOOLBAR_IMAGE_FILE_ADD:
- ShowFilechooser(FILECHOOSER_IMAGE);
- break;
- case TOOLBAR_FONT_FILE_ADD:
- ShowAlert("Not yet reimplemented ;)");
- break;
- case IMAGE_TWEEN_DELETE:
- ShowAlert("Not yet reimplemented ;)");
- break;
-#else
- case TOOLBAR_SAVE:
- if (Cur.open_file_name)
- SaveEDJ(Cur.open_file_name);
- else
- ShowFilechooser(FILECHOOSER_SAVE_EDJ);
- break;
- case TOOLBAR_SAVE_EDC:
- ShowFilechooser(FILECHOOSER_SAVE_EDC);
- break;
- case TOOLBAR_SAVE_EDJ:
+ {
+ case TOOLBAR_NEW:
+ system("edje_editor &");
+ break;
+ case TOOLBAR_OPEN:
+ //ShowAlert("Not yet implemented");
+ ShowFilechooser(FILECHOOSER_OPEN);
+ break;
+ case TOOLBAR_SAVE:
+ if (!etk_string_length_get(Cur.edj_file_name))
+ {
ShowFilechooser(FILECHOOSER_SAVE_EDJ);
break;
- case TOOLBAR_ADD:
- etk_menu_popup(ETK_MENU(UI_AddMenu));
- //etk_menu_popup_at_xy (ETK_MENU(AddMenu), 10, 10);
- break;
- case TOOLBAR_REMOVE:
- etk_menu_popup(ETK_MENU(UI_RemoveMenu));
- //etk_menu_popup_at_xy (ETK_MENU(AddMenu), 10, 10);
- break;
- case TOOLBAR_MOVE_UP: //Lower
- if (Cur.ep){
- Evas_List *l;
- Engrave_Part_State *eps;
- printf("Lower %s\n",Cur.ep->name);
-
- PROTO_engrave_part_lower(Cur.ep);
-
- l = evas_list_find_list(Cur.eg->parts, Cur.ep);
- if (!l) return ETK_TRUE;
-
- //delete part row with all childrens
- etk_tree_row_delete(ecore_hash_get(hash,Cur.ep));
- ecore_hash_remove(hash,Cur.ep);
-
- //re-add the row in correct place
- if (l->prev)
- AddPartToTree(Cur.ep, TRUE, l->prev->data);
- else
- AddPartToTree(Cur.ep, TRUE, NULL);
-
- //re-add all childrens
- l = Cur.ep->states;
- while (l)
- {
- AddStateToTree(l->data);
- l = l->next;
- }
- etk_tree_row_select (ecore_hash_get(hash,Cur.ep));
- }
- else
- ShowAlert("You must choose a part to lower");
- break;
- case TOOLBAR_MOVE_DOWN: //Raise
- if (Cur.ep){
- Evas_List *l;
- Engrave_Part_State *eps;
- printf("Raise %s\n",Cur.ep->name);
-
- PROTO_engrave_part_raise(Cur.ep);
-
- l = evas_list_find_list(Cur.eg->parts, Cur.ep);
- if (!l) return ETK_TRUE;
-
- //delete part row with all childrens
- etk_tree_row_delete(ecore_hash_get(hash,Cur.ep));
- ecore_hash_remove(hash,Cur.ep);
-
- //re-add the row in correct place
- if (l->prev)
- AddPartToTree(Cur.ep, TRUE, l->prev->data);
- else
- AddPartToTree(Cur.ep, TRUE, NULL);
+ }
+
+ edje_edit_save(edje_o);
+ if (!ecore_file_cp(Cur.edj_temp_name->string, Cur.edj_file_name->string))
+ {
+ ShowAlert("<b>ERROR:<\b><br>Can't write file");
+ }
+ break;
+ case TOOLBAR_SAVE_EDC:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_SAVE_EDJ:
+ ShowFilechooser(FILECHOOSER_SAVE_EDJ);
+ break;
+ case TOOLBAR_ADD:
+ etk_menu_popup(ETK_MENU(UI_AddMenu));
+ //ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_REMOVE:
+ etk_menu_popup(ETK_MENU(UI_RemoveMenu));
+ //ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_MOVE_UP: //Lower
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_MOVE_DOWN: //Raise
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_IMAGE_FILE_ADD:
+ ShowFilechooser(FILECHOOSER_IMAGE);
+ break;
+ case TOOLBAR_FONT_FILE_ADD:
+ ShowFilechooser(FILECHOOSER_FONT);
+ //ShowAlert("Not yet reimplemented ;)");
+ break;
+ case IMAGE_TWEEN_DELETE:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+ case TOOLBAR_OPTIONS:
+ etk_menu_popup(ETK_MENU(UI_OptionsMenu));
+ //etk_menu_popup_at_xy (ETK_MENU(AddMenu), 10, 10);
+ break;
+ case TOOLBAR_OPTION_BG1:
+ printf("SET_BG1\n");
+ edje_object_signal_emit(edje_ui,"set_bg1","edje_editor");
+ break;
+ case TOOLBAR_OPTION_BG2:
+ printf("SET_BG2\n");
+ edje_object_signal_emit(edje_ui,"set_bg2","edje_editor");
+ break;
+ case TOOLBAR_OPTION_BG3:
+ printf("SET_BG3\n");
+ edje_object_signal_emit(edje_ui,"set_bg3","edje_editor");
+ break;
+ case TOOLBAR_OPTION_BG4:
+ printf("SET_BG4\n");
+ edje_object_signal_emit(edje_ui,"set_bg4","edje_editor");
+ break;
+ case TOOLBAR_PLAY:
+ printf("Clicked signal on Toolbar Button 'Play' EMITTED\n");
+ if (!Cur.eg)
+ ShowAlert("You must select a group to test.");
+ else if (!Cur.open_file_name)
+ ShowAlert("You need to save the file before testing it.");
+ else
+ {
+ snprintf(cmd,1024,"edje_editor -t \"%s\" \"%s\" &",Cur.open_file_name,Cur.eg->name);
+ printf("TESTING EDJE. cmd: %s\n",cmd);
+ system(cmd);
+ }
+ break;
+ case TOOLBAR_DEBUG:
+ //on_RemoveMenu_item_activated(NULL, REMOVE_PART);
+ //on_AddMenu_item_activated(NULL, NEW_RECT);
+ //PopulateGroupsComboBox();
+ ChangeGroup("New group");
+ //DebugInfo(FALSE);
+ break;
+ case IMAGE_TWEEN_UP:
+ ShowAlert("Up not yet implemented.");
+ break;
+ case IMAGE_TWEEN_DOWN:
+ ShowAlert("Down not yet implemented.");
+ break;
+ case SAVE_SCRIPT:
+ text = etk_textblock_text_get(ETK_TEXT_VIEW(UI_ScriptBox)->textblock,ETK_TRUE);
+ if (Cur.epr)
+ {
+ printf("Save script (in prog %s): %s\n",Cur.epr->name,text->string);
+ engrave_program_script_set (Cur.epr, text->string);
- //re-add all childrens
- l = Cur.ep->states;
- while (l)
- {
- AddStateToTree(l->data);
- l = l->next;
- }
- etk_tree_row_select (ecore_hash_get(hash,Cur.ep));
- }
- else
- ShowAlert("You must choose a part to raise");
- break;
- case IMAGE_TWEEN_RADIO:
- UpdateImageFrame();
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio), TRUE);
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageNormalRadio), FALSE);
- etk_widget_show(UI_ImageTweenList);
- etk_widget_show(UI_MoveUpTweenButton);
- etk_widget_show(UI_MoveDownTweenButton);
- etk_widget_show(UI_DeleteTweenButton);
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_ImageComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ImageComboBox),0));
- break;
- case IMAGE_NORMAL_RADIO:
- PROTO_engrave_part_state_image_tween_remove_all(Cur.eps);
- UpdateImageFrame();
- break;
- case TOOLBAR_IMAGE_FILE_ADD:
- if (engrave_file_image_dir_get(Cur.ef)) ShowFilechooser(FILECHOOSER_IMAGE);
- else ShowAlert("You have to save the file once for insert image.");
- break;
- case TOOLBAR_FONT_FILE_ADD:
- if (engrave_file_font_dir_get(Cur.ef)) ShowFilechooser(FILECHOOSER_FONT);
- else ShowAlert("You have to save the file once for insert font.");
- break;
- case IMAGE_TWEEN_DELETE:
- sel_row = etk_tree_selected_row_get(ETK_TREE(UI_ImageTweenList));
- if ((row_num = (int)etk_tree_row_data_get (sel_row)))
- {
- PROTO_engrave_part_state_image_tween_remove_nth(Cur.eps,row_num-1);
- UpdateImageFrame();
- }
- break;
-#endif
- case TOOLBAR_OPTIONS:
- etk_menu_popup(ETK_MENU(UI_OptionsMenu));
- //etk_menu_popup_at_xy (ETK_MENU(AddMenu), 10, 10);
- break;
- case TOOLBAR_OPTION_BG1:
- printf("SET_BG1\n");
- edje_object_signal_emit(edje_ui,"set_bg1","edje_editor");
- break;
- case TOOLBAR_OPTION_BG2:
- printf("SET_BG2\n");
- edje_object_signal_emit(edje_ui,"set_bg2","edje_editor");
- break;
- case TOOLBAR_OPTION_BG3:
- printf("SET_BG3\n");
- edje_object_signal_emit(edje_ui,"set_bg3","edje_editor");
- break;
- case TOOLBAR_OPTION_BG4:
- printf("SET_BG4\n");
- edje_object_signal_emit(edje_ui,"set_bg4","edje_editor");
- break;
- case TOOLBAR_PLAY:
- printf("Clicked signal on Toolbar Button 'Play' EMITTED\n");
- if (!Cur.eg)
- ShowAlert("You must select a group to test.");
- else if (!Cur.open_file_name)
- ShowAlert("You need to save the file before testing it.");
- else
+ }else if (Cur.eg)
{
- snprintf(cmd,1024,"edje_editor -t \"%s\" \"%s\" &",Cur.open_file_name,Cur.eg->name);
- printf("TESTING EDJE. cmd: %s\n",cmd);
- system(cmd);
+ printf("Save script (in group %s): %s\n",Cur.eg->name,text->string);
+ engrave_group_script_set(Cur.eg, text->string);
}
- break;
- case TOOLBAR_DEBUG:
- DebugInfo(FALSE);
- break;
- case IMAGE_TWEEN_UP:
- ShowAlert("Up not yet implemented.");
- break;
- case IMAGE_TWEEN_DOWN:
- ShowAlert("Down not yet implemented.");
- break;
- case SAVE_SCRIPT:
- text = etk_textblock_text_get(ETK_TEXT_VIEW(UI_ScriptBox)->textblock,ETK_TRUE);
- if (Cur.epr)
- {
- printf("Save script (in prog %s): %s\n",Cur.epr->name,text->string);
- engrave_program_script_set (Cur.epr, text->string);
-
- }else if (Cur.eg)
- {
- printf("Save script (in group %s): %s\n",Cur.eg->name,text->string);
- engrave_group_script_set(Cur.eg, text->string);
- }
- etk_object_destroy(ETK_OBJECT(text));
- break;
- default:
- break;
- }
+ etk_object_destroy(ETK_OBJECT(text));
+ break;
+ default:
+ break;
+ }
return ETK_TRUE;
}
/* Tree callbacks */
-#if TEST_DIRECT_EDJE
Etk_Bool
on_PartsTree_row_selected(Etk_Object *object, Etk_Tree_Row *row, void *data)
{
int row_type=0;
char *name;
char *parent_name;
- int part_type = 0;
- Engrave_Group* old_group = Cur.eg;
printf("Row Selected Signal on one of the Tree EMITTED \n");
//get the info from the tree cols of the selected row
etk_tree_row_fields_get(row,
- COL_TYPE, &row_type,
- COL_NAME,NULL, NULL, &name,
- COL_PARENT, &parent_name,
- NULL);
+ COL_TYPE, &row_type,
+ COL_NAME,NULL, NULL, &name,
+ COL_PARENT, &parent_name,
+ NULL);
switch (row_type)
{
@@ -388,160 +284,16 @@
return ETK_TRUE;
}
-#else
-Etk_Bool
-on_PartsTree_row_selected(Etk_Object *object, Etk_Tree_Row *row, void *data)
-{
- int row_type=0;
- char *part;
- char *p;
- Engrave_Group* old_group = Cur.eg;
-
- printf("Row Selected Signal on one of the Tree EMITTED \n");
-
- //get the type of the row (group,part,desc or prog) from the hidden col
- etk_tree_row_fields_get(row,
- COL_TYPE, &row_type,
- NULL);
-
- switch (row_type)
- {
- case ROW_GROUP:
- Cur.epr = NULL;
- Cur.eg = etk_tree_row_data_get (row);
- Cur.ep = NULL;
- Cur.eps = NULL;
- //Hide
- edje_object_signal_emit(edje_ui,"description_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"position_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"image_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"part_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"program_frame_hide","edje_editor");
- //Show
- edje_object_signal_emit(edje_ui,"group_frame_show","edje_editor");
- edje_object_signal_emit(edje_ui,"script_frame_show","edje_editor");
-
- UpdateScriptFrame();
- break;
- case ROW_PART:
- Cur.epr = NULL;
- Cur.ep = etk_tree_row_data_get (row);
- Cur.eg = Cur.ep->parent;
- Cur.eps = NULL;
-
- edje_object_signal_emit(edje_ui,"description_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"position_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"image_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"group_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"program_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"part_frame_show","edje_editor");
- edje_object_signal_emit(edje_ui,"script_frame_hide","edje_editor");
-
- UpdatePartFrame();
-
- break;
- case ROW_DESC:
- Cur.epr = NULL;
- Cur.eps = etk_tree_row_data_get (row);
- Cur.ep = Cur.eps->parent;
- Cur.eg = Cur.ep->parent;
- Cur.ep->current_state = Cur.eps;
-
- UpdateDescriptionFrame();
- UpdatePositionFrame();
- UpdateComboPositionFrame();
-
- if (Cur.ep->type == ENGRAVE_PART_TYPE_TEXT)
- {
- UpdateTextFrame();
- edje_object_signal_emit(edje_ui,"text_frame_show","edje_editor");
- }else
- {
- edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
- }
-
- if (Cur.ep->type == ENGRAVE_PART_TYPE_IMAGE)
- {
- UpdateImageFrame();
- edje_object_signal_emit(edje_ui,"image_frame_show","edje_editor");
- }else
- {
- edje_object_signal_emit(edje_ui,"image_frame_hide","edje_editor");
- }
-
- if (Cur.ep->type == ENGRAVE_PART_TYPE_RECT)
- {
- UpdateRectFrame();
- edje_object_signal_emit(edje_ui,"rect_frame_show","edje_editor");
- }else
- {
- edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
- }
-
- edje_object_signal_emit(edje_ui,"part_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"group_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"program_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"script_frame_hide","edje_editor");
-
- edje_object_signal_emit(edje_ui,"description_frame_show","edje_editor");
- edje_object_signal_emit(edje_ui,"position_frame_show","edje_editor");
-
- break;
- case ROW_PROG:
- Cur.epr = etk_tree_row_data_get (row);
- Cur.eg = Cur.epr->parent;
- Cur.ep = NULL;
- Cur.eps = NULL;
-
- edje_object_signal_emit(edje_ui,"description_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"position_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"image_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"group_frame_hide","edje_editor");
- edje_object_signal_emit(edje_ui,"part_frame_hide","edje_editor");
-
- edje_object_signal_emit(edje_ui,"program_frame_show","edje_editor");
- edje_object_signal_emit(edje_ui,"script_frame_show","edje_editor");
-
- UpdateScriptFrame();
- UpdateProgFrame();
- PopulateSourceComboBox();
- break;
- }
-
- //The group as changed
- if (Cur.eg != old_group){
- int w, h;
-
- UpdateGroupFrame();
- PopulateRelComboBoxes();
-
- //Update Fakewin
- engrave_group_max_size_get(Cur.eg,&w,&h);
- ev_resize_fake(w,h);
- edje_object_part_text_set (EV_fakewin, "title", Cur.eg->name);
-
- engrave_canvas_current_group_set (engrave_canvas, Cur.eg);
- }
- ev_redraw();
- return ETK_TRUE;
-}
-#endif
/* Group frame callbacks */
Etk_Bool
on_GroupNameEntry_text_changed(Etk_Object *object, void *data)
{
- printf("Text Changed Signal on PartNameEntry EMITTED (text: %s)\n",etk_entry_text_get(ETK_ENTRY(object)));
-#if TEST_DIRECT_EDJE
- char *name;
+ //printf("Text Changed Signal on PartNameEntry EMITTED (text: %s)\n",etk_entry_text_get(ETK_ENTRY(object)));
+
+ const char *name;
name = etk_entry_text_get(ETK_ENTRY(object));
- edje_edit_group_name_set(edje_o, Cur.group->string, name);
+ edje_edit_group_name_set(edje_o, name);
//Update Group Combobox
Etk_Combobox_Item *item;
@@ -552,24 +304,6 @@
//Update FakeWin title
edje_object_part_text_set(EV_fakewin, "title", name);
-
-#else
- Etk_Tree_Col *col1=NULL;
- if (Cur.eg && ecore_hash_get(hash,Cur.eg))
- {
- engrave_group_name_set(Cur.eg,etk_entry_text_get(ETK_ENTRY(object)));
-
- //Update PartsTree
- if ((col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0)))
- etk_tree_row_fields_set(ecore_hash_get(hash,Cur.eg),TRUE,
- col1,EdjeFile,"NONE.PNG",engrave_group_name_get(Cur.eg),
- NULL);
-
- //update FakeWin title
- edje_object_part_text_set (EV_fakewin,
- "title", engrave_group_name_get(Cur.eg));
- }
-#endif
return ETK_TRUE;
}
@@ -578,7 +312,6 @@
on_GroupSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Group Spinners value changed signal EMIT\n");
-#if TEST_DIRECT_EDJE
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
switch ((int)data)
{
@@ -599,35 +332,6 @@
(int)etk_range_value_get(ETK_RANGE(UI_GroupMaxHSpinner)));
break;
}
-#else
- if (Cur.eg)
- {
- switch ((int)data)
- {
- case MINW_SPINNER:
- printf("MINW\n");
- engrave_group_min_size_set(Cur.eg,
- value,
- etk_range_value_get(ETK_RANGE(UI_GroupMinHSpinner)));
- break;
- case MINH_SPINNER:
- engrave_group_min_size_set(Cur.eg,
- etk_range_value_get(ETK_RANGE(UI_GroupMinWSpinner)),
- value);
- break;
- case MAXW_SPINNER:
- engrave_group_max_size_set(Cur.eg,
- value,
- etk_range_value_get(ETK_RANGE(UI_GroupMaxHSpinner)));
- break;
- case MAXH_SPINNER:
- engrave_group_max_size_set(Cur.eg,
- etk_range_value_get(ETK_RANGE(UI_GroupMaxWSpinner)),
- value);
- break;
- }
- }
-#endif
return ETK_TRUE;
}
@@ -635,11 +339,9 @@
Etk_Bool
on_PartNameEntry_text_changed(Etk_Object *object, void *data)
{
- Etk_Tree_Col *col1=NULL;
Etk_Tree_Row *row;
- char *text;
+ const char *text;
//printf("Text Changed Signal on PartNameEntry EMITTED (text: %s)\n",etk_entry_text_get(ETK_ENTRY(object)));
-#if TEST_DIRECT_EDJE
if (etk_string_length_get(Cur.part))
{
//Update PartTree
@@ -675,7 +377,7 @@
Etk_Tree_Row *child;
child = etk_tree_row_first_child_get(row);
etk_tree_row_fields_set(child, TRUE, COL_PARENT, text, NULL);
- while (child = etk_tree_row_next_get(child))
+ while ((child = etk_tree_row_next_get(child)))
etk_tree_row_fields_set(child, TRUE, COL_PARENT, text, NULL);
/* Update Parts_Hash */
@@ -691,39 +393,6 @@
/* Recreate rel combobox */
PopulateRelComboBoxes(); //TODO do a focus-out callback for this (don't need to do on every key!!)
}
-#else
- if (Cur.ep)
- {
- engrave_part_name_set(Cur.ep,etk_entry_text_get(ETK_ENTRY(object)));
- //RenamePart(Cur.ep,etk_entry_text_get(ETK_ENTRY(object)));
- PopulateRelComboBoxes();
- //Update PartTree
- col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0);
- switch (Cur.ep->type)
- {
- case ENGRAVE_PART_TYPE_IMAGE:
- etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
- col1,EdjeFile,"IMAGE.PNG",etk_entry_text_get(ETK_ENTRY(object)),
- NULL);
- break;
- case ENGRAVE_PART_TYPE_RECT:
- etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
- col1,EdjeFile,"RECT.PNG",etk_entry_text_get(ETK_ENTRY(object)),
- NULL);
- break;
- case ENGRAVE_PART_TYPE_TEXT:
- etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
- col1,EdjeFile,"TEXT.PNG",etk_entry_text_get(ETK_ENTRY(object)),
- NULL);
- break;
- default:
- etk_tree_row_fields_set(ecore_hash_get(hash,Cur.ep),TRUE,
- col1,EdjeFile,"NONE.PNG",etk_entry_text_get(ETK_ENTRY(object)),
- NULL);
- break;
- }
- }
-#endif
return ETK_TRUE;
}
@@ -731,19 +400,11 @@
on_PartEventsCheck_toggled(Etk_Object *object, void *data)
{
printf("Toggled Signal on EventsCheck EMITTED\n");
-#if TEST_DIRECT_EDJE
if (etk_string_length_get(Cur.part))
{
edje_edit_part_mouse_events_set(edje_o, Cur.part->string,
etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object)));
}
-#else
- if (Cur.ep)
- {
- engrave_part_mouse_events_set(Cur.ep,
- etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object)));
- }
-#endif
return ETK_TRUE;
}
@@ -751,24 +412,20 @@
on_PartEventsRepeatCheck_toggled(Etk_Object *object, void *data)
{
printf("Toggled Signal on EventsRepeatCheck EMITTED\n");
-#if TEST_DIRECT_EDJE
if (etk_string_length_get(Cur.part))
{
edje_edit_part_repeat_events_set(edje_o, Cur.part->string,
etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object)));
}
-#endif
return ETK_TRUE;
}
Etk_Bool
on_StateEntry_text_changed(Etk_Object *object, void *data)
{
- Etk_Tree_Col *col1=NULL;
- char buf[4096];
const char *nn; //new name
printf("Text Changed Signal on StateEntry EMITTED\n");
-#if TEST_DIRECT_EDJE
+
if (etk_string_length_get(Cur.state))
{
if (strcmp("default 0.00", Cur.state->string))
@@ -802,26 +459,6 @@
}
}
-#else
- if (Cur.eps)
- {
- printf("FOLLOW %s %f\n",Cur.eps->name,Cur.eps->value);
- if ((strcmp("default", Cur.eps->name)) || Cur.eps->value)
- {
- if ((nn = etk_entry_text_get(ETK_ENTRY(object))))
- engrave_part_state_name_set(Cur.eps,nn,Cur.eps->value);
- }else
- {
- ShowAlert("You can't rename default 0.0");
- }
-
- //Update PartTree
- col1 = etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), 0);
- snprintf(buf,4095,"%s %.2f",Cur.eps->name,Cur.eps->value);
- etk_tree_row_fields_set(ecore_hash_get(hash,Cur.eps),TRUE,
- col1,EdjeFile,"DESC.PNG",buf,NULL);
- }
-#endif
return ETK_TRUE;
}
@@ -858,16 +495,10 @@
on_AspectSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Value Changed Signal on AspectMinSpinner EMITTED\n");
-#if TEST_DIRECT_EDJE
edje_edit_state_aspect_min_set(edje_o, Cur.part->string, Cur.state->string,
etk_range_value_get(ETK_RANGE(UI_AspectMinSpinner)));
edje_edit_state_aspect_max_set(edje_o, Cur.part->string, Cur.state->string,
etk_range_value_get(ETK_RANGE(UI_AspectMaxSpinner)));
-#else
- engrave_part_state_aspect_set(Cur.eps,
- etk_range_value_get(ETK_RANGE(UI_AspectMinSpinner)),
- etk_range_value_get(ETK_RANGE(UI_AspectMaxSpinner)));
-#endif
return ETK_TRUE;
}
@@ -875,16 +506,9 @@
on_AspectComboBox_changed(Etk_Combobox *combobox, void *data)
{
printf("Active Item Changed Signal on AspectComboBox EMITTED\n");
-#if TEST_DIRECT_EDJE
- unsigned char pref;
- pref = etk_combobox_item_data_get(etk_combobox_active_item_get (combobox));
+ int pref;
+ pref = (int)etk_combobox_item_data_get(etk_combobox_active_item_get (combobox));
edje_edit_state_aspect_pref_set(edje_o, Cur.part->string, Cur.state->string, pref);
-#else
- Engrave_Aspect_Preference prefer;
-
- prefer = (Engrave_Aspect_Preference)etk_combobox_item_data_get(etk_combobox_active_item_get (combobox));
- engrave_part_state_aspect_preference_set(Cur.eps,prefer);
-#endif
return ETK_TRUE;
}
@@ -892,7 +516,7 @@
on_StateMinMaxSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Active Item Changed Signal on MinMaxSpinners EMITTED\n");
-#if TEST_DIRECT_EDJE
+
edje_edit_state_min_w_set(edje_o, Cur.part->string, Cur.state->string,
etk_range_value_get(ETK_RANGE(UI_StateMinWSpinner)));
edje_edit_state_min_h_set(edje_o, Cur.part->string, Cur.state->string,
@@ -901,48 +525,23 @@
etk_range_value_get(ETK_RANGE(UI_StateMaxWSpinner)));
edje_edit_state_max_h_set(edje_o, Cur.part->string, Cur.state->string,
etk_range_value_get(ETK_RANGE(UI_StateMaxHSpinner)));
-#else
- engrave_part_state_min_size_set(Cur.eps,
- etk_range_value_get(ETK_RANGE(UI_StateMinWSpinner)),
- etk_range_value_get(ETK_RANGE(UI_StateMinHSpinner)));
-
- engrave_part_state_max_size_set(Cur.eps,
- etk_range_value_get(ETK_RANGE(UI_StateMaxWSpinner)),
- etk_range_value_get(ETK_RANGE(UI_StateMaxHSpinner)));
-#endif
+
ev_redraw();
return ETK_TRUE;
}
/* Image Frame Callbacks */
Etk_Bool
-on_ImageComboBox_changed(Etk_Combobox *combobox, void *data)
+on_ImageComboBox_item_activated(Etk_Combobox *combobox, Etk_Combobox_Item *item, void *data)
{
- Engrave_Image *image;
printf("Changed signal on Image Combo EMITTED\n");
-#if TEST_DIRECT_EDJE
char *im;
if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
- im = etk_combobox_item_field_get(etk_combobox_active_item_get (combobox), 1);
+ im = etk_combobox_item_field_get(item, 1);
edje_edit_state_image_set(edje_o, Cur.part->string, Cur.state->string, im);
-#else
- if ((image = etk_combobox_item_data_get(etk_combobox_active_item_get (combobox)))){
- //Set an existing image
- if (Cur.eps){
- if (!etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio)))
- {
- engrave_part_state_image_normal_set(Cur.eps, image);
- }else{
- engrave_part_state_image_tween_add(Cur.eps,image);
- UpdateImageFrame();
- }
- ev_redraw();
- }
- }
-#endif
return ETK_TRUE;
}
@@ -950,20 +549,6 @@
Etk_Bool
on_ImageTweenList_row_selected(Etk_Object *object, Etk_Tree_Row *row, void *data)
{
-#if TEST_DIRECT_EDJE
-#else
- printf("Row selected signal on ImageTweenList EMITTED\n");
- if (row != etk_tree_first_row_get (ETK_TREE(UI_ImageTweenList)))
- {
- etk_widget_disabled_set(UI_DeleteTweenButton,FALSE);
- etk_widget_disabled_set(UI_MoveUpTweenButton,FALSE);
- etk_widget_disabled_set(UI_MoveDownTweenButton,FALSE);
- }else{
- etk_widget_disabled_set(UI_DeleteTweenButton,TRUE);
- etk_widget_disabled_set(UI_MoveUpTweenButton,TRUE);
- etk_widget_disabled_set(UI_MoveDownTweenButton,TRUE);
- }
-#endif
return ETK_TRUE;
}
@@ -971,18 +556,12 @@
on_ImageAlphaSlider_value_changed(Etk_Object *object, double va, void *data)
{
printf("ImageSlieder value_changed signale EMIT: %.2f\n",va);
-#if TEST_DIRECT_EDJE
+
if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
edje_edit_state_color_set(edje_o, Cur.part->string, Cur.state->string,
-1, -1, -1, (int)va);
ev_redraw();
-#else
- if (Cur.eps){
- engrave_part_state_color_set(Cur.eps, (int)va, (int)va, (int)va, (int)va);
- ev_redraw();
- }
-#endif
return ETK_TRUE;
}
@@ -991,8 +570,7 @@
on_BorderSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Value Changed signal on BorderSpinner EMITTED (value: %f)\n",etk_range_value_get(range));
-
-#if TEST_DIRECT_EDJE
+
if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
edje_edit_state_image_border_set(edje_o, Cur.part->string, Cur.state->string,
@@ -1002,19 +580,7 @@
(int)etk_range_value_get(ETK_RANGE(UI_BorderBottomSpinner)));
ev_redraw();
-#else
- if (Cur.eps){
- engrave_part_state_image_border_set(Cur.eps,
- (int)etk_range_value_get(ETK_RANGE(UI_BorderLeftSpinner)),
- (int)etk_range_value_get(ETK_RANGE(UI_BorderRightSpinner)),
- (int)etk_range_value_get(ETK_RANGE(UI_BorderTopSpinner)),
- (int)etk_range_value_get(ETK_RANGE(UI_BorderBottomSpinner)));
-
- printf("TODO: s: %s [%d] %d\n",Cur.eps->name,Cur.eps->image.border.l,(int)etk_range_value_get(ETK_RANGE(UI_BorderLeftSpinner)));
- ev_redraw();
- }
-#endif
return ETK_TRUE;
}
@@ -1022,9 +588,8 @@
Etk_Bool
on_RelToComboBox_changed(Etk_Combobox *combobox, void *data)
{
-#if TEST_DIRECT_EDJE
char *parent;
- parent = etk_combobox_item_field_get(etk_combobox_active_item_get (combobox), 1);
+ parent = etk_combobox_item_field_get(etk_combobox_active_item_get(combobox), 1);
if (strcmp(parent,"Interface") == 0)
parent = NULL;
@@ -1038,74 +603,33 @@
switch ((int)data)
{
case REL1X_SPINNER:
- edje_edit_state_rel1_to_x_set(edje_o, Cur.part->string, Cur.state->string, parent);
+ edje_edit_state_rel1_to_x_set(edje_o, Cur.part->string,
+ Cur.state->string, parent);
break;
case REL1Y_SPINNER:
- edje_edit_state_rel1_to_y_set(edje_o, Cur.part->string, Cur.state->string, parent);
+ edje_edit_state_rel1_to_y_set(edje_o, Cur.part->string,
+ Cur.state->string, parent);
break;
case REL2X_SPINNER:
- edje_edit_state_rel2_to_x_set(edje_o, Cur.part->string, Cur.state->string, parent);
+ edje_edit_state_rel2_to_x_set(edje_o, Cur.part->string,
+ Cur.state->string, parent);
break;
case REL2Y_SPINNER:
- edje_edit_state_rel2_to_y_set(edje_o, Cur.part->string, Cur.state->string, parent);
+ edje_edit_state_rel2_to_y_set(edje_o, Cur.part->string,
+ Cur.state->string, parent);
break;
}
edje_edit_part_selected_state_set(edje_o, Cur.part->string, Cur.state->string); //this make edje redraw (need to update in lib)
ev_redraw();
return ETK_TRUE;
-#else
- printf("RelTocomboBox changed signal EMITTED \n");
- Engrave_Part* part = NULL;
-
- part = etk_combobox_item_data_get (etk_combobox_active_item_get (combobox));
- if (part)
- {
- if (part == Cur.ep)
- {
- ShowAlert("A state can't rel to itself.");
- return ETK_TRUE;
- }
- switch ((int)data)
- {
- case REL1X_SPINNER:
- if ((int)part == REL_COMBO_INTERFACE)
- engrave_part_state_rel1_to_x_set(Cur.eps, NULL);
- else
- engrave_part_state_rel1_to_x_set(Cur.eps,part->name);
- break;
- case REL1Y_SPINNER:
- if ((int)part == REL_COMBO_INTERFACE)
- engrave_part_state_rel1_to_y_set(Cur.eps, NULL);
- else
- engrave_part_state_rel1_to_y_set(Cur.eps,part->name);
- break;
- case REL2X_SPINNER:
- if ((int)part == REL_COMBO_INTERFACE)
- engrave_part_state_rel2_to_x_set(Cur.eps, NULL);
- else
- engrave_part_state_rel2_to_x_set(Cur.eps,part->name);
- break;
- case REL2Y_SPINNER:
- if ((int)part == REL_COMBO_INTERFACE)
- engrave_part_state_rel2_to_y_set(Cur.eps, NULL);
- else
- engrave_part_state_rel2_to_y_set(Cur.eps,part->name);
- break;
- }
-
- }
-
- ev_redraw();
- return ETK_TRUE;
-#endif
}
Etk_Bool
on_RelSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Value Changed Signal on RelSpinner EMITTED (value: %f)\n",etk_range_value_get(range));
-#if TEST_DIRECT_EDJE
+
if (etk_string_length_get(Cur.state) && etk_string_length_get(Cur.part))
{
switch ((int)data)
@@ -1134,28 +658,6 @@
}
ev_redraw();
}
-#else
- if (Cur.eps)
- {
- switch ((int)data)
- {
- case REL1X_SPINNER:
- Cur.eps->rel1.relative.x = etk_range_value_get(range);
- break;
- case REL1Y_SPINNER:
- Cur.eps->rel1.relative.y = etk_range_value_get(range);
- break;
- case REL2X_SPINNER:
- Cur.eps->rel2.relative.x = etk_range_value_get(range);
- break;
- case REL2Y_SPINNER:
- Cur.eps->rel2.relative.y = etk_range_value_get(range);
- break;
- }
- ev_redraw();
- //ev_draw_focus();
- }
-#endif
return ETK_TRUE;
}
@@ -1163,7 +665,7 @@
on_RelOffsetSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Value Changed Signal on Offset Spinner EMITTED\n");
-#if TEST_DIRECT_EDJE
+
if (etk_string_length_get(Cur.state) && etk_string_length_get(Cur.part))
{
switch ((int)data)
@@ -1192,83 +694,37 @@
ev_redraw();
//ev_draw_focus();
}
-#else
- if (Cur.eps)
- {
- switch ((int)data)
- {
- case REL1X_SPINNER:
- Cur.eps->rel1.offset.x = etk_range_value_get(range);
- break;
- case REL1Y_SPINNER:
- Cur.eps->rel1.offset.y = etk_range_value_get(range);
- break;
- case REL2X_SPINNER:
- Cur.eps->rel2.offset.x = etk_range_value_get(range);
- break;
- case REL2Y_SPINNER:
- Cur.eps->rel2.offset.y = etk_range_value_get(range);
- break;
- }
- ev_redraw();
- //ev_draw_focus();
- }
-#endif
+
return ETK_TRUE;
}
/* Text Frame Callbacks */
Etk_Bool
-on_FontComboBox_changed(Etk_Combobox *combobox, void *data)
+on_FontComboBox_item_activated(Etk_Combobox *combobox, Etk_Combobox_Item *item, void *data)
{
printf("Changed Signal on FontComboBox EMITTED \n");
-#if TEST_DIRECT_EDJE
+
char *font;
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
- font = etk_combobox_item_field_get(etk_combobox_active_item_get(combobox), 1);
+ font = etk_combobox_item_field_get(item, 1);
edje_edit_state_font_set(edje_o, Cur.part->string, Cur.state->string, font);
-#else
- Engrave_Font *ef;
- if ((ef = etk_combobox_item_data_get(etk_combobox_active_item_get(combobox)))){
- //Set an existing font
- if (Cur.eps){
- printf("selected font: %s\n", engrave_font_name_get (ef));
- engrave_part_state_text_font_set(Cur.eps,engrave_font_name_get(ef));
- printf("changed font: %s\n", engrave_part_state_text_font_get(Cur.eps));
- ev_redraw();
- }
- }
-#endif
return ETK_TRUE;
}
Etk_Bool
on_EffectComboBox_changed(Etk_Combobox *combobox, void *data)
{
-#if TEST_DIRECT_EDJE
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
edje_edit_part_effect_set(edje_o, Cur.part->string,
- etk_combobox_item_data_get(etk_combobox_active_item_get(combobox)));
+ (int)etk_combobox_item_data_get(etk_combobox_active_item_get(combobox)));
ev_redraw();
-#else
- Engrave_Text_Effect effect;
- printf("Changed Signal on EffectComboBox EMITTED\n");
- if (Cur.ep)
- {
- if ((effect = (Engrave_Text_Effect)etk_combobox_item_data_get(etk_combobox_active_item_get (combobox))))
- {
- engrave_part_effect_set(Cur.ep,effect);
- ev_redraw();
- }
- }
-#endif
return ETK_TRUE;
}
@@ -1276,12 +732,10 @@
on_FontSizeSpinner_value_changed(Etk_Range *range, double value, void *data)
{
printf("Value Changed Signal on FontSizeSpinner EMITTED (value: %d)\n",(int)etk_range_value_get(range));
-#if TEST_DIRECT_EDJE
+
edje_edit_state_text_size_set(edje_o, Cur.part->string, Cur.state->string,
(int)etk_range_value_get(range));
-#else
- engrave_part_state_text_size_set(Cur.eps,(int)etk_range_value_get(range));
-#endif
+
ev_redraw();
return ETK_TRUE;
}
@@ -1290,12 +744,9 @@
on_TextEntry_text_changed(Etk_Object *object, void *data)
{
printf("Text Changed Signal on TextEntry EMITTED (value %s)\n",etk_entry_text_get(ETK_ENTRY(object)));
-#if TEST_DIRECT_EDJE
edje_edit_state_text_set(edje_o, Cur.part->string, Cur.state->string,
etk_entry_text_get(ETK_ENTRY(object)));
-#else
- engrave_part_state_text_text_set(Cur.eps,etk_entry_text_get(ETK_ENTRY(object)));
-#endif
+
ev_redraw();
return ETK_TRUE;
}
@@ -1305,32 +756,22 @@
{
printf("Value Changed Signal on AlignSpinner (h or v, text or part) EMITTED (value: %.2f)\n",etk_range_value_get(range));
-#if TEST_DIRECT_EDJE
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
- if (data == TEXT_ALIGNH_SPINNER)
+ if ((int)data == TEXT_ALIGNH_SPINNER)
edje_edit_state_text_align_x_set(edje_o, Cur.part->string, Cur.state->string,
(double)etk_range_value_get(range));
- if (data == TEXT_ALIGNV_SPINNER)
+ if ((int)data == TEXT_ALIGNV_SPINNER)
edje_edit_state_text_align_y_set(edje_o, Cur.part->string, Cur.state->string,
(double)etk_range_value_get(range));
- if (data == STATE_ALIGNH_SPINNER)
+ if ((int)data == STATE_ALIGNH_SPINNER)
edje_edit_state_align_x_set(edje_o, Cur.part->string, Cur.state->string,
(double)etk_range_value_get(range));
- if (data == STATE_ALIGNV_SPINNER)
+ if ((int)data == STATE_ALIGNV_SPINNER)
edje_edit_state_align_y_set(edje_o, Cur.part->string, Cur.state->string,
(double)etk_range_value_get(range));
-#else
- if (data == TEXT_ALIGNH_SPINNER)
- engrave_part_state_text_align_set(Cur.eps, etk_range_value_get(range), -1);
- if (data == TEXT_ALIGNV_SPINNER)
- engrave_part_state_text_align_set(Cur.eps, -1, etk_range_value_get(range));
- if (data == STATE_ALIGNH_SPINNER)
- engrave_part_state_align_set(Cur.eps, etk_range_value_get(range), -1);
- if (data == STATE_ALIGNV_SPINNER)
- engrave_part_state_align_set(Cur.eps, -1, etk_range_value_get(range));
-#endif
+
return ETK_TRUE;
}
@@ -1350,7 +791,7 @@
//Get the new action from the combo data
action = (Engrave_Action)etk_combobox_item_data_get(
- etk_combobox_active_item_get (combobox));
+ etk_combobox_active_item_get(combobox));
//set the action in the current program
engrave_program_action_set(Cur.epr, action,
@@ -1485,12 +926,12 @@
Cur.epr->targets=NULL; //ABSOLUTLY NOT THE RIGHT WAY!!!! TODO FIXME
//Spit the string in token and add every targets
- tok = strtok (text,",");
+ tok = strtok(text,",");
while (tok != NULL)
{
- printf ("'%s'\n",tok);
+ printf("'%s'\n",tok);
engrave_program_target_add(Cur.epr,tok);
- tok = strtok (NULL, ",");
+ tok = strtok(NULL, ",");
}
//TODO Check if all the targets exists in the group, otherwise make the text red
@@ -1507,7 +948,7 @@
//get the action from the combo data
action = (Engrave_Action)etk_combobox_item_data_get(
- etk_combobox_active_item_get (ETK_COMBOBOX(UI_ActionComboBox)));
+ etk_combobox_active_item_get(ETK_COMBOBOX(UI_ActionComboBox)));
engrave_program_action_set(Cur.epr,action,
etk_entry_text_get(ETK_ENTRY(UI_Param1Entry)),
@@ -1526,7 +967,7 @@
//get the action from the combo data
action = (Engrave_Action)etk_combobox_item_data_get(
- etk_combobox_active_item_get (ETK_COMBOBOX(UI_ActionComboBox)));
+ etk_combobox_active_item_get(ETK_COMBOBOX(UI_ActionComboBox)));
engrave_program_action_set(Cur.epr,action,
etk_entry_text_get(ETK_ENTRY(UI_Param1Entry)),
@@ -1546,7 +987,7 @@
//get the action from the combo data
action = (Engrave_Action)etk_combobox_item_data_get(
- etk_combobox_active_item_get (ETK_COMBOBOX(UI_ActionComboBox)));
+ etk_combobox_active_item_get(ETK_COMBOBOX(UI_ActionComboBox)));
engrave_program_action_set(Cur.epr,action,
etk_entry_text_get(ETK_ENTRY(UI_Param1Entry)),
@@ -1567,7 +1008,7 @@
//get the transition from the combo data
tran = (Engrave_Transition)etk_combobox_item_data_get(
- etk_combobox_active_item_get (combobox));
+ etk_combobox_active_item_get(combobox));
engrave_program_transition_set(Cur.epr,tran,
etk_range_value_get(ETK_RANGE(UI_DurationSpinner)));
@@ -1583,7 +1024,7 @@
//get the transition from the combo data
tran = (Engrave_Transition)etk_combobox_item_data_get(
- etk_combobox_active_item_get (ETK_COMBOBOX(UI_TransiComboBox)));
+ etk_combobox_active_item_get(ETK_COMBOBOX(UI_TransiComboBox)));
engrave_program_transition_set(Cur.epr,tran,
etk_range_value_get(ETK_RANGE(UI_DurationSpinner)));
@@ -1625,8 +1066,8 @@
//Because I can't add any object to the canvas before it is realized
Evas_Object* rect;
//Add the colored rectangle
- rect = evas_object_rectangle_add (etk_widget_toplevel_evas_get(canvas));
- etk_canvas_object_add (ETK_CANVAS(canvas), rect);
+ rect = evas_object_rectangle_add(etk_widget_toplevel_evas_get(canvas));
+ etk_canvas_object_add(ETK_CANVAS(canvas), rect);
evas_object_color_set(rect, 100,100,100,255);
evas_object_resize(rect,300,300);
etk_canvas_object_move(ETK_CANVAS(canvas),rect,0,0);
@@ -1663,38 +1104,22 @@
{
case COLOR_OBJECT_RECT:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Rectangle color");
-#if TEST_DIRECT_EDJE
edje_edit_state_color_get(edje_o, Cur.part->string, Cur.state->string, &c.r,&c.g,&c.b,&c.a);
-#else
- engrave_part_state_color_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
-#endif
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_TEXT:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Text color");
-#if TEST_DIRECT_EDJE
edje_edit_state_color_get(edje_o, Cur.part->string, Cur.state->string, &c.r,&c.g,&c.b,&c.a);
-#else
- engrave_part_state_color_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
-#endif
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_SHADOW:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Shadow color");
-#if TEST_DIRECT_EDJE
edje_edit_state_color3_get(edje_o, Cur.part->string, Cur.state->string, &c.r,&c.g,&c.b,&c.a);
-#else
- engrave_part_state_color2_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
-#endif
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_OUTLINE:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Outline color");
-#if TEST_DIRECT_EDJE
edje_edit_state_color2_get(edje_o, Cur.part->string, Cur.state->string, &c.r,&c.g,&c.b,&c.a);
-#else
- engrave_part_state_color3_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
-#endif
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
}
@@ -1708,7 +1133,7 @@
Etk_Color color;
Etk_Color premuled;
- color = etk_colorpicker_current_color_get (ETK_COLORPICKER(object));
+ color = etk_colorpicker_current_color_get(ETK_COLORPICKER(object));
// printf("Color: %d %d %d %d\n",color.r,color.g,color.b,color.a);
if (color.r > 255) color.r = 255;
@@ -1727,39 +1152,27 @@
switch (current_color_object){
case COLOR_OBJECT_RECT:
evas_object_color_set(RectColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
-#if TEST_DIRECT_EDJE
edje_edit_state_color_set(edje_o, Cur.part->string, Cur.state->string,
premuled.r,premuled.g,premuled.b,premuled.a);
-#else
- engrave_part_state_color_set(Cur.eps,color.r,color.g,color.b,color.a);
-#endif
+
break;
case COLOR_OBJECT_TEXT:
evas_object_color_set(TextColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
-#if TEST_DIRECT_EDJE
edje_edit_state_color_set(edje_o, Cur.part->string, Cur.state->string,
premuled.r,premuled.g,premuled.b,premuled.a);
-#else
- engrave_part_state_color_set(Cur.eps,color.r,color.g,color.b,color.a);
-#endif
+
break;
case COLOR_OBJECT_SHADOW:
evas_object_color_set(ShadowColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
-#if TEST_DIRECT_EDJE
edje_edit_state_color3_set(edje_o, Cur.part->string, Cur.state->string,
premuled.r,premuled.g,premuled.b,premuled.a);
-#else
- engrave_part_state_color2_set(Cur.eps,color.r,color.g,color.b,color.a);
-#endif
+
break;
case COLOR_OBJECT_OUTLINE:
evas_object_color_set(OutlineColorObject,premuled.r,premuled.g,premuled.b,premuled.a);
-#if TEST_DIRECT_EDJE
edje_edit_state_color2_set(edje_o, Cur.part->string, Cur.state->string,
premuled.r,premuled.g,premuled.b,premuled.a);
-#else
- engrave_part_state_color3_set(Cur.eps,color.r,color.g,color.b,color.a);
-#endif
+
break;
}
@@ -1771,226 +1184,228 @@
Etk_Bool
on_AddMenu_item_activated(Etk_Object *object, void *data)
{
- Engrave_Group *group = NULL;
- Engrave_Part *part;
- Engrave_Part_State *new_state;
- Engrave_Program *prog = NULL;
-
printf("Item Activated Signal on AddMenu EMITTED\n");
-
+ Etk_Tree_Row *row;
+ Etk_Combobox_Item *item;
switch ((int)data)
{
- case NEW_RECT:
- if (Cur.eg){
- part = engrave_part_new(ENGRAVE_PART_TYPE_RECT);
- engrave_part_name_set (part, "new rectangle");
- engrave_group_part_add(Cur.eg, part);
- AddPartToTree(part, 0, NULL);
-
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "default", 0.0);
- engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
- engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
- engrave_part_state_add(part,new_state);
- AddStateToTree(new_state);
-
- Cur.ep = part;
-
- etk_tree_row_select(ecore_hash_get(hash,new_state));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
-
- PopulateRelComboBoxes();
- }else{
+ case NEW_RECT:
+ if (!etk_string_length_get(Cur.group))
+ {
ShowAlert("You must first select a group.");
+ break;
+ }
+ if (!edje_edit_part_add(edje_o, "New rectangle", EDJE_PART_TYPE_RECTANGLE))
+ {
+ ShowAlert("Can't create part.");
+ break;
}
+ //TODO generate a unique new name
+ AddPartToTree("New rectangle");
+ row = AddStateToTree("New rectangle", "default 0.00");
+ etk_tree_row_select(row);
+ etk_tree_row_unfold(evas_hash_find(Parts_Hash, "New rectangle"));
+ PopulateRelComboBoxes();
break;
+
case NEW_IMAGE:
- if (Cur.eg){
- part = engrave_part_new(ENGRAVE_PART_TYPE_IMAGE);
- engrave_part_name_set (part, "new image");
- engrave_group_part_add(Cur.eg, part);
- AddPartToTree(part, 0, NULL);
-
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "default", 0.0);
- engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
- engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
- engrave_part_state_add(part,new_state);
- AddStateToTree(new_state);
-
- Cur.ep = part;
-
- etk_tree_row_select(ecore_hash_get(hash,new_state));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
-
- PopulateRelComboBoxes();
- }else{
+ if (!etk_string_length_get(Cur.group))
+ {
ShowAlert("You must first select a group.");
+ break;
+ }
+ if (!edje_edit_part_add(edje_o, "New image", EDJE_PART_TYPE_IMAGE))
+ {
+ ShowAlert("Can't create part.");
+ break;
+ }
+ //TODO generate a unique new name
+ AddPartToTree("New image");
+ row = AddStateToTree("New image", "default 0.00");
+
+ char *image;
+ item = etk_combobox_first_item_get(ETK_COMBOBOX(UI_ImageComboBox));
+ if (item)
+ {
+ image = etk_combobox_item_field_get(item, 1);
+ if (image)
+ edje_edit_state_image_set(edje_o, "New image",
+ "default 0.00", image);
}
+
+ etk_tree_row_select(row);
+ etk_tree_row_unfold(evas_hash_find(Parts_Hash, "New image"));
+ PopulateRelComboBoxes();
break;
+
case NEW_TEXT:
- if (Cur.eg){
- part = engrave_part_new(ENGRAVE_PART_TYPE_TEXT);
- engrave_part_name_set (part, "new text");
- engrave_group_part_add(Cur.eg, part);
- AddPartToTree(part, 0, NULL);
-
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "default", 0.0);
- engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
- engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
- engrave_part_state_text_size_set(new_state,16);
- engrave_part_state_text_text_set(new_state,"something to say...");
-
- engrave_part_state_add(part,new_state);
- engrave_part_effect_set(part,ENGRAVE_TEXT_EFFECT_GLOW);
-
- AddStateToTree(new_state);
-
- Cur.ep = part;
-
- etk_tree_row_select(ecore_hash_get(hash,new_state));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
-
- PopulateRelComboBoxes();
- }else{
+ if (!etk_string_length_get(Cur.group))
+ {
ShowAlert("You must first select a group.");
+ break;
}
- break;
- case NEW_PROG:
- if (Cur.eg){
- prog = engrave_program_new();
- engrave_program_name_set(prog,"new program");
- engrave_group_program_add(Cur.eg,prog);
- AddProgramToTree(prog);
- }else{
- ShowAlert("You must first select a group.");
+ if (!edje_edit_part_add(edje_o, "New text", EDJE_PART_TYPE_TEXT))
+ {
+ ShowAlert("Can't create part.");
+ break;
}
+ //TODO generate a unique new name
+ AddPartToTree("New text");
+ row = AddStateToTree("New text", "default 0.00");
+
+ char *font;
+ item = etk_combobox_first_item_get(ETK_COMBOBOX(UI_FontComboBox));
+ if (item)
+ {
+ font = etk_combobox_item_field_get(item, 1);
+ if (font)
+ edje_edit_state_font_set(edje_o, "New text",
+ "default 0.00", font);
+ }
+ edje_edit_state_text_size_set(edje_o, "New text",
+ "default 0.00", 16);
+ edje_edit_state_text_set(edje_o, "New text",
+ "default 0.00", "Something to say !");
+ edje_edit_part_effect_set(edje_o, "New text", EDJE_TEXT_EFFECT_GLOW);
+
+ etk_tree_row_select(row);
+ etk_tree_row_unfold(evas_hash_find(Parts_Hash, "New text"));
+ PopulateRelComboBoxes();
break;
+
case NEW_DESC:
- if (Cur.ep){
- new_state = engrave_part_state_new();
- engrave_part_state_name_set(new_state, "state", 0.0);
- engrave_part_state_add(Cur.ep,new_state);
- AddStateToTree(new_state);
-
- etk_tree_row_select(ecore_hash_get(hash,new_state));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
- etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
-
- }else{
+ if (!etk_string_length_get(Cur.part))
+ {
ShowAlert("You must first select a part.");
+ break;
}
+
+ //Create state
+ edje_edit_state_add(edje_o, Cur.part->string, "New state");
+ edje_edit_state_rel1_relative_x_set(edje_o, Cur.part->string,
+ "New state 0.00", 0.1);
+ edje_edit_state_rel1_relative_y_set(edje_o, Cur.part->string,
+ "New state 0.00", 0.1);
+ edje_edit_state_rel2_relative_x_set(edje_o, Cur.part->string,
+ "New state 0.00", 0.9);
+ edje_edit_state_rel2_relative_y_set(edje_o, Cur.part->string,
+ "New state 0.00", 0.9);
+ edje_edit_state_text_size_set(edje_o, Cur.part->string,
+ "New state 0.00", 16);
+ //Add state to tree
+ row = AddStateToTree(Cur.part->string, "New state 0.00");
+ etk_tree_row_select(row);
+ etk_tree_row_unfold(evas_hash_find(Parts_Hash,Cur.part->string));
+
break;
+
+ case NEW_PROG:
+ if (!etk_string_length_get(Cur.group))
+ {
+ ShowAlert("You must first select a group.");
+ break;
+ }
+ ShowAlert("not yet implemented.");
+ break;
+
case NEW_GROUP:
- group = engrave_group_new();
- engrave_group_name_set (group, "New group");
- engrave_file_group_add (Cur.ef, group);
-
- AddGroupToTree(group);
-
- etk_tree_row_select(ecore_hash_get(hash,group));
+ if (edje_edit_group_add(edje_o, "New group"))
+ {
+ PopulateGroupsComboBox();
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_GroupsComboBox),
+ etk_combobox_last_item_get(ETK_COMBOBOX(UI_GroupsComboBox)));
+ }
+ else
+ {
+ ShowAlert("Can't create group.");
+ }
break;
}
ev_redraw();
-
return ETK_TRUE;
}
Etk_Bool
on_RemoveMenu_item_activated(Etk_Object *object, void *data)
{
- Etk_Tree_Row* row;
+ Etk_Tree_Row *row, *next;
printf("Item Activated Signal on RemoveMenu EMITTED\n");
- switch ((int)data){
- case REMOVE_DESCRIPTION:
- if (Cur.eps){
- if (strcmp(engrave_part_state_name_get(Cur.eps,NULL),"default") || Cur.eps->value != 0){
- printf("REMOVE DESCRIPTION: %s\n",Cur.eps->name);
- row = etk_tree_row_next_get(ecore_hash_get(hash,Cur.eps));
- if (!row) row = etk_tree_row_prev_get(ecore_hash_get(hash,Cur.eps));
- etk_tree_row_delete(ecore_hash_get(hash,Cur.eps));
- ecore_hash_remove (hash, Cur.eps);
- PROTO_engrave_part_state_remove(Cur.ep, Cur.eps);
- engrave_part_state_free(Cur.eps);
-
- Cur.eps = NULL;
- if (row) etk_tree_row_select (row);
- ev_redraw();
- }else{
- ShowAlert("You can't remove default 0.0");
- }
- }else{
+ switch ((int)data)
+ {
+ case REMOVE_DESCRIPTION:
+ if (!etk_string_length_get(Cur.state))
+ {
ShowAlert("No part state selected");
+ break;
}
- break;
+ if (!strcmp(Cur.state->string,"default 0.00"))
+ {
+ ShowAlert("You can't remove default 0.0");
+ break;
+ }
+ edje_edit_state_del(edje_o, Cur.part->string, Cur.state->string);
+
+ // Select next row (if no exist select prev); and delete current.
+ row = etk_tree_selected_row_get(ETK_TREE(UI_PartsTree));
+ next = etk_tree_row_next_get(row);
+ if (!next)
+ next = etk_tree_row_prev_get(row);
+ etk_tree_row_select(next);
+ etk_tree_row_delete(row);
+
+ break;
case REMOVE_PART:
- if (Cur.ep){
- printf("REMOVE PART: %s\n",Cur.ep->name);
- row = NULL;
- row = etk_tree_row_next_get(ecore_hash_get(hash,Cur.ep));
- if (!row) row = etk_tree_row_prev_get(ecore_hash_get(hash,Cur.ep));
- etk_tree_row_delete(ecore_hash_get(hash,Cur.ep));
- ecore_hash_remove (hash, Cur.ep);
- PROTO_engrave_group_part_remove(Cur.eg,Cur.ep);
- engrave_part_free(Cur.ep);
-
- Cur.ep = NULL;
- Cur.eps = NULL;
-
- if (row) etk_tree_row_select(row);
- else etk_tree_row_select(etk_tree_row_last_child_get (etk_tree_last_row_get (ETK_TREE(UI_PartsTree))));
-
- ev_redraw();
- }else{
+ if (!etk_string_length_get(Cur.part))
+ {
ShowAlert("No part selected");
+ break;
}
- break;
- case REMOVE_GROUP:
- if (Cur.eg)
+ if (!edje_edit_part_del(edje_o, Cur.part->string))
{
- row = NULL;
- row = etk_tree_row_next_get(ecore_hash_get(hash,Cur.eg));
- if (!row) row = etk_tree_row_prev_get(ecore_hash_get(hash,Cur.eg));
-
- etk_tree_row_delete(ecore_hash_get(hash,Cur.eg));
- ecore_hash_remove (hash, Cur.eg);
- PROTO_engrave_file_group_remove(Cur.ef,Cur.eg);
- engrave_group_free(Cur.eg);
-
- Cur.eg = NULL;
- Cur.ep = NULL;
- Cur.eps = NULL;
-
- ev_redraw();
- if (row) etk_tree_row_select(row);
- }else{
- ShowAlert("No group selected");
+ ShowAlert("Can't delete part");
+ break;
}
- break;
- case REMOVE_PROG:
- if (Cur.epr)
+
+ row = evas_hash_find(Parts_Hash, Cur.part->string);
+ Parts_Hash = evas_hash_del(Parts_Hash, Cur.part->string, NULL);
+
+ next = etk_tree_row_next_get(row);
+ if (!next)
+ next = etk_tree_row_prev_get(row);
+ etk_tree_row_delete(row);
+ if (next)
+ etk_tree_row_select(next);
+ else
{
- row = NULL;
- row = etk_tree_row_next_get(ecore_hash_get(hash,Cur.epr));
- if (!row) row = etk_tree_row_prev_get(ecore_hash_get(hash,Cur.epr));
- etk_tree_row_delete(ecore_hash_get(hash,Cur.epr));
- ecore_hash_remove (hash, Cur.epr);
- PROTO_engrave_group_program_remove(Cur.eg, Cur.epr);
- engrave_program_free(Cur.epr);
-
- Cur.epr = NULL;
-
- ev_redraw();
- if (row) etk_tree_row_select(row);
- }else{
- ShowAlert("No program selected");
+ Cur.part = etk_string_clear(Cur.part);
+ Cur.state = etk_string_clear(Cur.state);
}
- break;
+
+ PopulateRelComboBoxes();
+ //ev_redraw();
+ break;
+
+ case REMOVE_GROUP:
+ if (!edje_edit_group_del(edje_o))
+ {
+ ShowAlert("Can't delete group");
+ break;
+ }
+ Etk_Combobox_Item *item, *nitem;
+ item = etk_combobox_active_item_get(ETK_COMBOBOX(UI_GroupsComboBox));
+
+ nitem = etk_combobox_item_next_get(item);
+ if (!nitem)
+ nitem = etk_combobox_item_prev_get(item);
+
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_GroupsComboBox), nitem);
+ etk_combobox_item_remove(item);
+ break;
+
+ case REMOVE_PROG:
+ ShowAlert("not yet implemented");
+ break;
}
return ETK_TRUE;
}
@@ -2000,7 +1415,6 @@
on_FileChooserDialog_response(Etk_Dialog *dialog, int response_id, void *data)
{
char cmd[4096];
- int ret = 0;
printf("Response Signal on Filechooser EMITTED\n");
@@ -2008,107 +1422,47 @@
switch(FileChooserOperation){
case FILECHOOSER_OPEN:
-#if TEST_DIRECT_EDJE
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)));
- LoadEDJ2(cmd);
-#else
- snprintf(cmd,4096,"edje_editor \"%s/%s\" &",
- etk_filechooser_widget_current_folder_get (ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
- etk_filechooser_widget_selected_file_get (ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
- system(cmd);
-#endif
+ LoadEDJ(cmd);
break;
case FILECHOOSER_SAVE_EDJ:
printf("SAVE EDJ\n");
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 TEST_DIRECT_EDJE
+ etk_filechooser_widget_current_folder_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
+ etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
edje_edit_save(edje_o);
if(!ecore_file_cp(Cur.edj_temp_name->string, cmd))
{
ShowAlert("<b>ERROR:<\b><br>Can't write file");
}
-#else
- SaveEDJ(cmd);
-#endif
+ else
+ {
+ Cur.edj_file_name = etk_string_set(Cur.edj_file_name, cmd);
+ ecore_evas_title_set(UI_ecore_MainWin, cmd);
+ }
break;
case FILECHOOSER_SAVE_EDC:
- printf("SAVE EDC\n");
- 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 (!SaveEDC(cmd))
- ShowAlert("Error saving file.");
+ ShowAlert("Not yet implemented.");
break;
case FILECHOOSER_IMAGE:
-#if TEST_DIRECT_EDJE
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)));
- edje_edit_image_add(edje_o, cmd);
- PopulateImagesComboBox();
-#else
- if (Cur.eps){
- //If the new image is not in the edc dir
- if (strcmp(etk_filechooser_widget_current_folder_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),engrave_file_image_dir_get(Cur.ef))){
- //TODO check if image already exist and is a valid image
- //Copy the image to the image_dir
- snprintf(cmd, 4096, "cp \"%s/%s\" \"%s\"",
- etk_filechooser_widget_current_folder_get (ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
- etk_filechooser_widget_selected_file_get (ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
- engrave_file_image_dir_get(Cur.ef));
- ret = system(cmd);
- if (ret < 0) {
- ShowAlert("Error: unable to copy image!");
- return ETK_TRUE;
- }
- }
- //Set the new image
- Engrave_Image* eimg;
- eimg = engrave_image_new(etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),ENGRAVE_IMAGE_TYPE_LOSSY,95);
- engrave_file_image_add(Cur.ef,eimg);
- if (!etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio)))
- engrave_part_state_image_normal_set(Cur.eps,eimg);
- else
- engrave_part_state_image_tween_add(Cur.eps,eimg);
-
- PopulateImagesComboBox();
- UpdateImageFrame();
- ev_redraw();
+ 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_image_add(edje_o, cmd))
+ {
+ ShowAlert("ERROR: Can't import image file.");
+ break;
}
-#endif
+ PopulateImagesComboBox();
break;
case FILECHOOSER_FONT:
- if (Cur.eps){
- //If the new font is not in the edc dir
- if (strcmp(etk_filechooser_widget_current_folder_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),engrave_file_font_dir_get(Cur.ef))){
- //TODO check if font already exist in the EDCFileDir
- //Copy the font to the EDCDir
- snprintf(cmd, 4096, "cp \"%s/%s\" \"%s\"",
- etk_filechooser_widget_current_folder_get (ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
- etk_filechooser_widget_selected_file_get (ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
- engrave_file_font_dir_get(Cur.ef));
- ret = system(cmd);
- if (ret < 0) {
- ShowAlert("Error: unable to copy font!");
- return ETK_TRUE;
- }
- }
- //Set the new font
- Engrave_Font *efont;
- efont = engrave_font_new(
- etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
- etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
- engrave_file_font_add(Cur.ef,efont);
- engrave_part_state_text_font_set(Cur.eps,etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
-
+ 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();
- UpdateTextFrame();
- ev_redraw();
- }
break;
}
etk_widget_hide(ETK_WIDGET(dialog));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- callbacks.h 28 Dec 2007 23:01:41 -0000 1.19
+++ callbacks.h 15 Feb 2008 21:41:21 -0000 1.20
@@ -1,8 +1,10 @@
-
+#ifndef _EDJE_EDITOR_CALLBACKS_H_
+#define _EDJE_EDITOR_CALLBACKS_H_
/* Called when the window is destroyed */
Etk_Bool etk_main_quit_cb(void *data);
void ecore_delete_cb(Ecore_Evas *ee);
+void ecore_resize_callback(Ecore_Evas *ecore_evas);
//void on_GroupComboBox_changed (Etk_Combobox *combobox, void *data);
Etk_Bool on_GroupSpinner_value_changed (Etk_Range *range, double value, void *data);
@@ -26,12 +28,12 @@
Etk_Bool on_BorderSpinner_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_RelOffsetSpinner_value_changed (Etk_Range *range, double value, void *data);
-Etk_Bool on_FontComboBox_changed (Etk_Combobox *combobox, void *data);
+Etk_Bool on_FontComboBox_item_activated (Etk_Combobox *combobox, Etk_Combobox_Item *item, void *data);
Etk_Bool on_FontSizeSpinner_value_changed (Etk_Range *range, double value, void *data);
Etk_Bool on_ColorCanvas_realize (Etk_Widget *canvas, void *data);
Etk_Bool on_ImageAlphaSlider_value_changed (Etk_Object *object, double value, void *data);
-Etk_Bool on_ImageComboBox_changed (Etk_Combobox *combobox, void *data);
+Etk_Bool on_ImageComboBox_item_activated (Etk_Combobox *combobox, Etk_Combobox_Item *item, void *data);
Etk_Bool on_ImageTweenList_row_selected (Etk_Object *object, Etk_Tree_Row *row, void *data);
Etk_Bool on_EffectComboBox_changed (Etk_Combobox *combobox, void *data);
Etk_Bool on_AlertDialog_response (Etk_Dialog *dialog, int response_id, void *data);
@@ -54,7 +56,8 @@
Etk_Bool on_DurationSpinner_value_changed (Etk_Range *range, double value, void *data);
Etk_Bool on_AfterEntry_text_changed (Etk_Object *object, void *data);
-#if TEST_DIRECT_EDJE
+
Etk_Bool on_GroupsComboBox_activated(Etk_Combobox *combobox, Etk_Combobox_Item *item, void *data);
void signal_cb(void *data, Evas_Object *o, const char *sig, const char *src);
+
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- evas.c 7 Feb 2008 17:29:53 -0000 1.25
+++ evas.c 15 Feb 2008 21:41:21 -0000 1.26
@@ -4,10 +4,7 @@
#include "main.h"
#include "interface.h"
#include "evas.h"
-
-#if TEST_DIRECT_EDJE
- #include <Edje_Edit.h>
-#endif
+#include <Edje_Edit.h>
#define MAIN_LEFT 20
#define MAIN_TOP 27
@@ -44,19 +41,15 @@
//Calc the rel1_relative_x value
evas_object_geometry_get(rel1X_parent_handler, &parentx,
&parenty, &parentw, &parenth);
-#if TEST_DIRECT_EDJE
- edje_edit_state_rel1_relative_x_set(edje_o, Cur.part->string, Cur.state->string, (float)(mouse_x - parentx)/(float)parentw);
-#else
- Cur.eps->rel1.relative.x = (float)(mouse_x - parentx)/(float)parentw;
-#endif
+ edje_edit_state_rel1_relative_x_set(edje_o, Cur.part->string,
+ Cur.state->string, (float)(mouse_x - parentx)/(float)parentw);
+
//Calc the rel1_relative_y value
evas_object_geometry_get(rel1Y_parent_handler, &parentx,
&parenty, &parentw, &parenth);
-#if TEST_DIRECT_EDJE
- edje_edit_state_rel1_relative_y_set(edje_o, Cur.part->string, Cur.state->string, (float)(mouse_y - parenty)/(float)parenth);
-#else
- Cur.eps->rel1.relative.y = (float)(mouse_y - parenty)/(float)parenth;
-#endif
+
+ edje_edit_state_rel1_relative_y_set(edje_o, Cur.part->string,
+ Cur.state->string,(float)(mouse_y - parenty)/(float)parenth);
UpdatePositionFrame();
}
@@ -69,20 +62,14 @@
//Calc the rel2_relative_x value
evas_object_geometry_get(rel2X_parent_handler,
&parentx, &parenty, &parentw, &parenth);
-#if TEST_DIRECT_EDJE
- edje_edit_state_rel2_relative_x_set(edje_o, Cur.part->string, Cur.state->string, (float)(mouse_x - parentx)/(float)parentw);
-#else
- Cur.eps->rel2.relative.x = (float)(mouse_x - parentx)/(float)parentw;
-#endif
+ edje_edit_state_rel2_relative_x_set(edje_o, Cur.part->string,
+ Cur.state->string, (float)(mouse_x - parentx)/(float)parentw);
//Calc the rel2_relative_y value
evas_object_geometry_get(rel2Y_parent_handler, &parentx,
&parenty, &parentw, &parenth);
-#if TEST_DIRECT_EDJE
- edje_edit_state_rel2_relative_y_set(edje_o, Cur.part->string, Cur.state->string, (float)(mouse_y - parenty)/(float)parenth);
-#else
- Cur.eps->rel2.relative.y = (float)(mouse_y - parenty)/(float)parenth;
-#endif
+ edje_edit_state_rel2_relative_y_set(edje_o, Cur.part->string,
+ Cur.state->string, (float)(mouse_y - parenty)/(float)parenth);
UpdatePositionFrame();
}
@@ -103,11 +90,10 @@
if ((int)data == DRAG_REL2)
edje_object_signal_callback_add(rel2_handler,"DRAG","rel2",
on_Drag,(void*)DRAG_REL2);
- /* THIS COMMENT DISABLE THE FAKEWIN MOVE ABILITY (don't like it)
+ /* THIS COMMENT DISABLE THE FAKEWIN MOVE ABILITY (don't like it) */
if ((int)data == DRAG_MOVEBOX)
evas_object_event_callback_add(EV_movebox, EVAS_CALLBACK_MOUSE_MOVE,
on_Drag, (void*)DRAG_MOVEBOX);
- */
}
@@ -116,11 +102,11 @@
{
//printf("End Drag\n");
if ((int)data == DRAG_REL1)
- edje_object_signal_callback_del(rel1_handler,"DRAG","rel1",on_Drag);
+ edje_object_signal_callback_del(rel1_handler,"DRAG","rel1",on_Drag);
if ((int)data == DRAG_REL2)
- edje_object_signal_callback_del(rel2_handler,"DRAG","rel2",on_Drag);
+ edje_object_signal_callback_del(rel2_handler,"DRAG","rel2",on_Drag);
if ((int)data == DRAG_MOVEBOX)
- evas_object_event_callback_del(EV_movebox, EVAS_CALLBACK_MOUSE_MOVE, on_Drag);
+ evas_object_event_callback_del(EV_movebox, EVAS_CALLBACK_MOUSE_MOVE, on_Drag);
if ((int)data == DRAG_MINIARROW)
{
int fw,fh; //Fakewin geometry
@@ -194,11 +180,9 @@
{
int ParentX,ParentY,ParentW,ParentH;
int fx,fy,fw,fh; //Fakewin geometry
- Engrave_Part *relto_part;
//printf("DRAW FOCUS\n");
-#if TEST_DIRECT_EDJE
int o1x, o1y, o2x, o2y;
const char *state;
@@ -222,18 +206,19 @@
//printf("CURRENT STATE: %s - %d\n",state,o1x);
evas_object_move(focus_handler,
- px + wx - o1x - 2, //- Cur.ep->current_state->rel1.offset.x - 2,
- py + wy - o1y - 2);// - Cur.ep->current_state->rel1.offset.y - 2);
+ px + wx - o1x - 2,
+ py + wy - o1y - 2);
evas_object_resize(focus_handler,
- pw + o1x - o2x + 2, // + Cur.ep->current_state->rel1.offset.x - Cur.ep->current_state->rel2.offset.x + 2,
- ph + o1y - o2y + 2);// + Cur.ep->current_state->rel1.offset.y - Cur.ep->current_state->rel2.offset.y + 2);
- evas_object_raise (focus_handler);
+ pw + o1x - o2x + 2,
+ ph + o1y - o2y + 2);
+ evas_object_raise(focus_handler);
evas_object_show(focus_handler);
}else
evas_object_hide(focus_handler);
- // if a part description is selected draw also the parent handlers (the red and blue lines)
+ // if a part description is selected draw also
+ // the parent handlers (the red and blue lines)
if (etk_string_length_get(Cur.state) && etk_string_length_get(Cur.part))
{
int px,py,pw,ph;
@@ -248,15 +233,15 @@
// printf("PA geom: %d %d %d %d\n",px,py,pw,ph);
//Draw rel1 & rel2 point
- evas_object_move (rel1_handler,
- fx + px - o1x - 2,
- fy + py - o1y - 2);
+ evas_object_move(rel1_handler,
+ fx + px - o1x - 2,
+ fy + py - o1y - 2);
evas_object_show(rel1_handler);
evas_object_raise(rel1_handler);
- evas_object_move (rel2_handler,
- fx + px + pw - o2x - 4,
- fy + py + ph - o2y - 4);
+ evas_object_move(rel2_handler,
+ fx + px + pw - o2x - 4,
+ fy + py + ph - o2y - 4);
evas_object_show(rel2_handler);
evas_object_raise(rel2_handler);
@@ -269,9 +254,12 @@
ParentW = rw;
ParentH = rh;
edje_edit_string_free(rel);
- }else//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
- evas_object_line_xy_set (rel1X_parent_handler, ParentX, ParentY, ParentX+ParentW, ParentY);
+ }
+ else//Get FakeWin Geom
+ evas_object_geometry_get(EV_fakewin, &ParentX, &ParentY,
+ &ParentW, &ParentH);
+ evas_object_line_xy_set(rel1X_parent_handler, ParentX, ParentY,
+ ParentX+ParentW, ParentY+1);
//draw Rel1Y_ParentH (left line)
if((rel = edje_edit_state_rel1_to_y_get(edje_o, Cur.part->string, Cur.state->string)))
@@ -282,9 +270,12 @@
ParentW = rw;
ParentH = rh;
edje_edit_string_free(rel);
- }else//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
- evas_object_line_xy_set (rel1Y_parent_handler, ParentX, ParentY, ParentX, ParentY+ParentH);
+ }
+ else//Get FakeWin Geom
+ evas_object_geometry_get(EV_fakewin, &ParentX, &ParentY,
+ &ParentW, &ParentH);
+ evas_object_line_xy_set(rel1Y_parent_handler, ParentX, ParentY,
+ ParentX, ParentY+ParentH);
//draw Rel2X_ParentH (bottom line)
if((rel = edje_edit_state_rel2_to_x_get(edje_o, Cur.part->string, Cur.state->string)))
@@ -295,162 +286,28 @@
ParentW = rw;
ParentH = rh;
edje_edit_string_free(rel);
- }else//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
- evas_object_line_xy_set (rel2X_parent_handler, ParentX, ParentY+ParentH, ParentX+ParentW, ParentY+ParentH);
+ }
+ else//Get FakeWin Geom
+ evas_object_geometry_get(EV_fakewin, &ParentX, &ParentY,
+ &ParentW, &ParentH);
+ evas_object_line_xy_set(rel2X_parent_handler, ParentX, ParentY+ParentH,
+ ParentX+ParentW+1, ParentY+ParentH+1);
//draw Rel2Y_ParentH (right line)
- if((rel = edje_edit_state_rel2_to_y_get(edje_o, Cur.part->string, Cur.state->string))){
+ if((rel = edje_edit_state_rel2_to_y_get(edje_o, Cur.part->string, Cur.state->string)))
+ {
edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
ParentX = fx + rx;
ParentY = fy + ry;
ParentW = rw;
ParentH = rh;
edje_edit_string_free(rel);
- }else//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
-
- evas_object_line_xy_set (rel2Y_parent_handler, ParentX+ParentW, ParentY, ParentX+ParentW, ParentY+ParentH);
-
- evas_object_raise(rel1X_parent_handler);
- evas_object_show(rel1X_parent_handler);
- evas_object_raise(rel1Y_parent_handler);
- evas_object_show(rel1Y_parent_handler);
- evas_object_raise(rel2X_parent_handler);
- evas_object_show(rel2X_parent_handler);
- evas_object_raise(rel2Y_parent_handler);
- evas_object_show(rel2Y_parent_handler);
- evas_object_raise(focus_handler);
- evas_object_raise(rel1_handler);
- evas_object_raise(rel2_handler);
-
- }else{ //none selected, hide all
- edje_object_signal_emit(rel1_handler,"REL1_HIDE","edje_editor");
- edje_object_signal_emit(focus_handler,"REL2_HIDE","edje_editor");
- 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);
- }
-#else
- if (Cur.ep && !Cur.ep->current_state)
- Cur.ep->current_state = Cur.ep->states->data;
-
- // If a part is selected draw the Focus Handler (only the yellow box)
- if (Cur.ep && Cur.ep->current_state)
- {
- int x, y;
- evas_object_geometry_get(EV_fakewin,&x,&y,NULL,NULL);
-
- evas_object_move(focus_handler,
- Cur.ep->pos.x + x - Cur.ep->current_state->rel1.offset.x - 2,
- Cur.ep->pos.y + y - Cur.ep->current_state->rel1.offset.y - 2);
-
- evas_object_resize(focus_handler,
- Cur.ep->pos.w + Cur.ep->current_state->rel1.offset.x - Cur.ep->current_state->rel2.offset.x + 2,
- Cur.ep->pos.h + Cur.ep->current_state->rel1.offset.y - Cur.ep->current_state->rel2.offset.y + 2);
- ///evas_object_raise (focus_handler);
- evas_object_show(focus_handler);
- }else
- {
- evas_object_hide(focus_handler);
- }
-
- // if a part description is selected draw also the parent handlers (the red and blue lines)
- if(Cur.eps && EV_fakewin)
- {
- //printf("Draw parent Handlers\n");
-
- //Get the geometry of fakewin
- evas_object_geometry_get(EV_fakewin,&fx,&fy,&fw,&fh);
-
- //printf("FW geom: %d %d %d %d\n",fx,fy,fw,fh);
- //printf("pos.x: %d \n",Cur.eps->pos.w);
- //Draw rel1 & rel2 point
- evas_object_move (rel1_handler,
- fx + Cur.ep->pos.x - Cur.eps->rel1.offset.x - 2,
- fy + Cur.ep->pos.y - Cur.eps->rel1.offset.y - 2);
- evas_object_show(rel1_handler);
-
- evas_object_raise(rel1_handler);
-
- evas_object_move (rel2_handler,
- fx + Cur.ep->pos.x + Cur.ep->pos.w - Cur.eps->rel2.offset.x - 4,
- fy + Cur.ep->pos.y + Cur.ep->pos.h - Cur.eps->rel2.offset.y - 4);
- evas_object_show(rel2_handler);
- evas_object_raise(rel2_handler);
-
-
- //draw Rel1X_ParentH (top line)
- if (engrave_part_state_rel1_to_x_get(Cur.eps)){
- relto_part = engrave_group_part_by_name_find(Cur.eg,
- engrave_part_state_rel1_to_x_get(Cur.eps));
- if (relto_part->current_state)
- {
- ParentX = fx + relto_part->pos.x;
- ParentY = fy + relto_part->pos.y;
- ParentW = relto_part->pos.w;
- ParentH = relto_part->pos.h;
- }
- }else{//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
- }
- //evas_object_move (rel1X_parent_handler, ParentX,ParentY);
- //evas_object_resize(rel1X_parent_handler,ParentW,2);
- evas_object_line_xy_set (rel1X_parent_handler, ParentX, ParentY, ParentX+ParentW, ParentY);
-
- //draw Rel1Y_ParentH (left line)
- if (engrave_part_state_rel1_to_y_get(Cur.eps)){
- relto_part = engrave_group_part_by_name_find(Cur.eg,
- engrave_part_state_rel1_to_y_get(Cur.eps));
- if (relto_part->current_state)
- {
- ParentX = fx + relto_part->pos.x;
- ParentY = fy + relto_part->pos.y;
- ParentW = relto_part->pos.w;
- ParentH = relto_part->pos.h;
- }
- }else{//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
- }
- evas_object_line_xy_set (rel1Y_parent_handler, ParentX, ParentY, ParentX, ParentY+ParentH);
-
- //draw Rel2X_ParentH (bottom line)
- if (engrave_part_state_rel2_to_x_get(Cur.eps)){
- relto_part = engrave_group_part_by_name_find(Cur.eg,
- engrave_part_state_rel2_to_x_get(Cur.eps));
- if (relto_part->current_state)
- {
- ParentX = fx + relto_part->pos.x;
- ParentY = fy + relto_part->pos.y;
- ParentW = relto_part->pos.w;
- ParentH = relto_part->pos.h;
- }
- }else{//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
- }
- //evas_object_move (rel2X_parent_handler, ParentX,ParentY+ParentH-1);
- //evas_object_resize(rel2X_parent_handler,ParentW,2);
- evas_object_line_xy_set (rel2X_parent_handler, ParentX, ParentY+ParentH, ParentX+ParentW, ParentY+ParentH);
-
-
- //draw Rel2Y_ParentH (right line)
- if (engrave_part_state_rel2_to_y_get(Cur.eps)){
- relto_part = engrave_group_part_by_name_find(Cur.eg,
- engrave_part_state_rel2_to_y_get(Cur.eps));
- if (relto_part->current_state)
- {
- ParentX = fx + relto_part->pos.x;
- ParentY = fy + relto_part->pos.y;
- ParentW = relto_part->pos.w;
- ParentH = relto_part->pos.h;
- }
- }else{//Get FakeWin Geom
- evas_object_geometry_get (EV_fakewin, &ParentX, &ParentY, &ParentW, &ParentH);
}
- evas_object_line_xy_set (rel2Y_parent_handler, ParentX+ParentW, ParentY, ParentX+ParentW, ParentY+ParentH);
+ else//Get FakeWin Geom
+ evas_object_geometry_get(EV_fakewin, &ParentX, &ParentY,
+ &ParentW, &ParentH);
+ evas_object_line_xy_set(rel2Y_parent_handler, ParentX+ParentW, ParentY,
+ ParentX+ParentW, ParentY+ParentH);
evas_object_raise(rel1X_parent_handler);
evas_object_show(rel1X_parent_handler);
@@ -464,9 +321,7 @@
evas_object_raise(rel1_handler);
evas_object_raise(rel2_handler);
-
-
- }else{
+ }else{ //none selected, hide all
edje_object_signal_emit(rel1_handler,"REL1_HIDE","edje_editor");
edje_object_signal_emit(focus_handler,"REL2_HIDE","edje_editor");
evas_object_hide(rel1X_parent_handler);
@@ -476,7 +331,6 @@
evas_object_hide(rel1_handler);
evas_object_hide(rel2_handler);
}
- #endif
}
void
@@ -486,13 +340,9 @@
int max_h = 0;
int min_w = 0;
int min_h = 0;
-#if TEST_DIRECT_EDJE
+
edje_object_size_min_get(edje_o, &min_w, &min_h);
edje_object_size_max_get(edje_o, &max_w, &max_h);
-#else
- engrave_group_max_size_get(Cur.eg, &max_w, &max_h);
- engrave_group_min_size_get(Cur.eg, &min_w, &min_h);
-#endif
if (max_w > 0 && w > max_w) w = max_w;
if (max_h > 0 && h > max_h) h = max_h;
@@ -505,7 +355,8 @@
evas_object_resize(EV_fakewin, w, h);
evas_object_resize(EV_movebox, w, 10);
- edje_object_part_drag_value_set (EV_fakewin, "miniarrow", (double)w, (double)h);
+ edje_object_part_drag_value_set(EV_fakewin, "miniarrow",
+ (double)w, (double)h);
char buf[100];
snprintf(buf,100,"Current size: %d x %d",w,h);
etk_label_set(ETK_LABEL(UI_CurrentGroupSizeLabel), buf);
@@ -518,7 +369,7 @@
evas_object_move(EV_fakewin, x, y);
evas_object_move(EV_movebox, x, y-14);
}
-#if TEST_DIRECT_EDJE
+
void
ev_redraw(void)
{
@@ -559,51 +410,3 @@
evas_object_hide(rel2_handler);
}
}
-#else
-void
-ev_redraw(void)
-{
- int x, y, w, h;
-
- //printf("DRAW ALL\n");
-
- if (Cur.eg)
- {
- //Get the geometry of ETK_canvas
- //evas_object_geometry_get(EV_canvas_bg,&x,&y,&w,&h);
-
- //Get the geometry of fakewin
- evas_object_geometry_get(EV_fakewin,&x,&y,&w,&h);
-
- //place engrave canvas
- evas_object_move(engrave_canvas, x, y);
- evas_object_resize(engrave_canvas, w+1, h);
- //This make engrave_canvas redraw (BAD!!)
- engrave_canvas_current_group_set(engrave_canvas, Cur.eg);
-
- evas_object_show(engrave_canvas);
- evas_object_show(EV_fakewin);
- evas_object_show(EV_movebox);
- // evas_object_raise(EV_fakewin);
- // evas_object_raise(EV_movebox);
- // evas_object_raise(focus_handler);
- //evas_object_raise(UI_GroupFrameEmbed);
- // evas_object_raise(UI_RectFrame);
- //evas_object_raise(UI_RectFrameEmbed);
- ev_draw_focus();
-
- }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);
- }
-}
-#endif
-
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas.h 31 Jan 2007 06:02:21 -0000 1.4
+++ evas.h 15 Feb 2008 21:41:21 -0000 1.5
@@ -1,9 +1,12 @@
+#ifndef _EDJE_EDITOR_EVAS_H_
+#define _EDJE_EDITOR_EVAS_H_
-void ev_redraw (void);
-void ev_draw_focus (void);
-void ev_draw_part (Engrave_Part* part);
-void ev_resize_fake (int w, int h);
-void ev_move_fake (int x, int y);
-void ev_hide_group (Engrave_Group* group);
-void prepare_canvas (void);
+void ev_redraw(void);
+void ev_draw_focus(void);
+void ev_draw_part(Engrave_Part* part);
+void ev_resize_fake(int w, int h);
+void ev_move_fake(int x, int y);
+void ev_hide_group(Engrave_Group* group);
+void prepare_canvas(void);
+#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/inout.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- inout.c 26 Nov 2007 03:04:33 -0000 1.8
+++ inout.c 15 Feb 2008 21:41:21 -0000 1.9
@@ -6,115 +6,115 @@
#include "main.h"
#include "inout.h"
-#define MAIN_EDC_NAME "edje_editor_link.edc"
+//~ #define MAIN_EDC_NAME "edje_editor_link.edc"
-Etk_Widget *Load_TextView;
-Etk_Widget *Load_ProgBar;
-Etk_Widget *Load_Win;
-Etk_Widget *Save_ProgBar;
-Etk_Widget *Save_TextView;
-Ecore_Timer *progress_bar_timer;
+//~ Etk_Widget *Load_TextView;
+//~ Etk_Widget *Load_ProgBar;
+//~ Etk_Widget *Load_Win;
+//~ Etk_Widget *Save_ProgBar;
+//~ Etk_Widget *Save_TextView;
+//~ Ecore_Timer *progress_bar_timer;
-Ecore_Event_Handler *eeh1, *eeh2, *eeh3;
+//Ecore_Event_Handler *eeh1, *eeh2, *eeh3;
-void
-etk_textview_append(Etk_Widget *tv, char *str)
-{
- Etk_Textblock_Iter *iter;
- if (!tv || !str) return;
- iter = etk_text_view_cursor_get (ETK_TEXT_VIEW(tv));
- etk_textblock_insert_markup(ETK_TEXT_VIEW(tv)->textblock, iter,
- str, strlen(str));
-}
+//~ void
+//~ etk_textview_append(Etk_Widget *tv, char *str)
+//~ {
+ //~ Etk_Textblock_Iter *iter;
+ //~ if (!tv || !str) return;
+ //~ iter = etk_text_view_cursor_get (ETK_TEXT_VIEW(tv));
+ //~ etk_textblock_insert_markup(ETK_TEXT_VIEW(tv)->textblock, iter,
+ //~ str, strlen(str));
+//~ }
+
+//~ void
+//~ create_load_window()
+//~ {
+ //~ Etk_Widget *vbox;
+ //~ Etk_Widget *scrolled_view;
+ //~ Etk_Widget *button;
+ //~ Etk_Widget *label;
+
+ //~ //Load Win
+ //~ Load_Win = etk_window_new();
+ //~ etk_widget_size_request_set(Load_Win, 400, 300);
+ //~ etk_window_title_set(ETK_WINDOW(Load_Win), "Loading...");
+ //~ etk_signal_connect("destroyed", ETK_OBJECT(Load_Win),
+ //~ ETK_CALLBACK(etk_main_quit), NULL);
+
+ //~ vbox = etk_vbox_new(ETK_FALSE, 0);
+ //~ etk_container_add(ETK_CONTAINER(Load_Win), vbox);
+
+ //~ label = etk_label_new("<font_size=20><b>Loading file</b></>");
+ //~ etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ //~ etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 5);
+
+ //~ //Progress bar
+ //~ Load_ProgBar = etk_progress_bar_new_with_text("Working...");
+ //~ etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(Load_ProgBar), 0.03);
+ //~ etk_box_append(ETK_BOX(vbox), Load_ProgBar, ETK_BOX_START, ETK_BOX_NONE, 5);
+
+ //~ //Text_view
+ //~ Load_TextView = etk_text_view_new ();
+ //~ scrolled_view = etk_scrolled_view_new();
+ //~ etk_scrolled_view_policy_set(ETK_SCROLLED_VIEW(scrolled_view),
+ //~ ETK_POLICY_HIDE, ETK_POLICY_SHOW);
+ //~ etk_bin_child_set( ETK_BIN(scrolled_view), Load_TextView);
+ //~ etk_box_append(ETK_BOX(vbox), scrolled_view,
+ //~ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 5);
+
+ //~ //buttons
+ //~ button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CLOSE);
+ //~ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 5);
+ //~ etk_signal_connect("clicked", ETK_OBJECT(button),
+ //~ ETK_CALLBACK(etk_main_quit), NULL);
+
+ //~ etk_widget_show_all(Load_Win);
+//~ }
+
+//~ void
+//~ create_save_window()
+//~ {
+ //~ Etk_Widget *Save_Win;
+ //~ Etk_Widget *vbox;
+ //~ Etk_Widget *scrolled_view;
+ //~ Etk_Widget *button;
+ //~ Etk_Widget *label;
+
+ //~ //Save Win
+ //~ Save_Win = etk_window_new();
+ //~ etk_widget_size_request_set(Save_Win, 400, 300);
+ //~ etk_window_title_set(ETK_WINDOW(Save_Win), "Saving...");
+
+ //~ vbox = etk_vbox_new(ETK_FALSE, 0);
+ //~ etk_container_add(ETK_CONTAINER(Save_Win), vbox);
+
+ //~ label = etk_label_new("<font_size=20><b>Saving file</b></>");
+ //~ etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ //~ etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 5);
+
+ //~ //Progress bar
+ //~ Save_ProgBar = etk_progress_bar_new_with_text("Working...");
+ //~ etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(Save_ProgBar), 0.03);
+ //~ etk_box_append(ETK_BOX(vbox), Save_ProgBar, ETK_BOX_START, ETK_BOX_NONE, 5);
+
+ //~ //Text_view
+ //~ Save_TextView = etk_text_view_new ();
+ //~ scrolled_view = etk_scrolled_view_new();
+ //~ etk_scrolled_view_policy_set(ETK_SCROLLED_VIEW(scrolled_view),
+ //~ ETK_POLICY_HIDE, ETK_POLICY_SHOW);
+ //~ etk_bin_child_set( ETK_BIN(scrolled_view), Save_TextView);
+ //~ etk_box_append(ETK_BOX(vbox), scrolled_view,
+ //~ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 5);
+
+ //~ //buttons
+ //~ button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CLOSE);
+ //~ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 5);
+ //~ etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
+ //~ ETK_CALLBACK(etk_widget_hide), Save_Win);
-void
-create_load_window()
-{
- Etk_Widget *vbox;
- Etk_Widget *scrolled_view;
- Etk_Widget *button;
- Etk_Widget *label;
-
- //Load Win
- Load_Win = etk_window_new();
- etk_widget_size_request_set(Load_Win, 400, 300);
- etk_window_title_set(ETK_WINDOW(Load_Win), "Loading...");
- etk_signal_connect("destroyed", ETK_OBJECT(Load_Win),
- ETK_CALLBACK(etk_main_quit), NULL);
-
- vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_container_add(ETK_CONTAINER(Load_Win), vbox);
-
- label = etk_label_new("<font_size=20><b>Loading file</b></>");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 5);
-
- //Progress bar
- Load_ProgBar = etk_progress_bar_new_with_text("Working...");
- etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(Load_ProgBar), 0.03);
- etk_box_append(ETK_BOX(vbox), Load_ProgBar, ETK_BOX_START, ETK_BOX_NONE, 5);
-
- //Text_view
- Load_TextView = etk_text_view_new ();
- scrolled_view = etk_scrolled_view_new();
- etk_scrolled_view_policy_set(ETK_SCROLLED_VIEW(scrolled_view),
- ETK_POLICY_HIDE, ETK_POLICY_SHOW);
- etk_bin_child_set( ETK_BIN(scrolled_view), Load_TextView);
- etk_box_append(ETK_BOX(vbox), scrolled_view,
- ETK_BOX_START, ETK_BOX_EXPAND_FILL, 5);
-
- //buttons
- button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CLOSE);
- etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 5);
- etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(etk_main_quit), NULL);
-
- etk_widget_show_all(Load_Win);
-}
-
-void
-create_save_window()
-{
- Etk_Widget *Save_Win;
- Etk_Widget *vbox;
- Etk_Widget *scrolled_view;
- Etk_Widget *button;
- Etk_Widget *label;
-
- //Save Win
- Save_Win = etk_window_new();
- etk_widget_size_request_set(Save_Win, 400, 300);
- etk_window_title_set(ETK_WINDOW(Save_Win), "Saving...");
-
- vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_container_add(ETK_CONTAINER(Save_Win), vbox);
-
- label = etk_label_new("<font_size=20><b>Saving file</b></>");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 5);
-
- //Progress bar
- Save_ProgBar = etk_progress_bar_new_with_text("Working...");
- etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(Save_ProgBar), 0.03);
- etk_box_append(ETK_BOX(vbox), Save_ProgBar, ETK_BOX_START, ETK_BOX_NONE, 5);
-
- //Text_view
- Save_TextView = etk_text_view_new ();
- scrolled_view = etk_scrolled_view_new();
- etk_scrolled_view_policy_set(ETK_SCROLLED_VIEW(scrolled_view),
- ETK_POLICY_HIDE, ETK_POLICY_SHOW);
- etk_bin_child_set( ETK_BIN(scrolled_view), Save_TextView);
- etk_box_append(ETK_BOX(vbox), scrolled_view,
- ETK_BOX_START, ETK_BOX_EXPAND_FILL, 5);
-
- //buttons
- button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CLOSE);
- etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 5);
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(etk_widget_hide), Save_Win);
-
- etk_widget_show_all(Save_Win);
-}
+ //~ etk_widget_show_all(Save_Win);
+//~ }
int
backup_file(char *file_name)
@@ -131,299 +131,272 @@
return FALSE;
}
-char*
-SaveEDC(char *file_name)
-{
- char tmpn[1024];
- int fd = 0;
- char *file;
-
- if (!file_name)
- {
- //Create tmp file
- strcpy(tmpn, "/tmp/edje_editor_tmp.edc-XXXXXX");
- fd = mkstemp(tmpn);
- if (fd < 0)
- {
- printf("Can't create temp file: %s\nError: %s\n",
- tmpn,strerror(errno));
- return NULL;
- }
- file = tmpn;
- }
- else
- file = file_name;
-
- printf("SaveEDC file: %s\n",file);
-
- engrave_edc_output(Cur.ef, file);
-
- //TODO check engrave output on error
- if (!ecore_file_exists(file))
- return NULL;
-
- return file;
-}
-
-int
-SaveEDJ(char *file_name)
-{
- char *tmpn;
- char ipart[1024], fpart[1024];
- char buf[4096];
- char cmd[2048];
- const char *imgdir, *fontdir;
-
- create_save_window();
-
- //Start progress_bar
- progress_bar_timer = ecore_timer_add(0.025,
- (int(*)(void *data))etk_progress_bar_pulse, Save_ProgBar);
-
- //backup existing file
- backup_file(file_name);
-
- //Create temp edc file
- tmpn = SaveEDC(NULL); //TODO remove the temp file
- if (!tmpn)
- {
- snprintf(buf,4096,"<font color=#FF0000><b>Can't create edc tmp file:</b> %s\n</font>\n", tmpn);
- etk_textview_append(Save_TextView,buf);
- stop_bar(Save_ProgBar,"Error");
- return 0;
- }
-
- snprintf(buf,4096,"<b>Created edc tmp file:</b> %s\n",tmpn);
- etk_textview_append(Save_TextView,buf);
-
- //Get image and font directory
- imgdir = engrave_file_image_dir_get(Cur.ef);
- fontdir = engrave_file_font_dir_get(Cur.ef);
- snprintf(buf,4096,"<b>Image dir:</b> %s\n<b>Font dir:</b> %s\n",
- imgdir,fontdir);
- etk_textview_append(Save_TextView,buf);
-
- if (imgdir) snprintf(ipart, sizeof(ipart), "-id %s", imgdir);
- else ipart[0] = '\0';
-
- if (fontdir) snprintf(fpart, sizeof(fpart), "-fd %s", fontdir);
- else fpart[0] = '\0';
-
- //Create edje_cc command line
- snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s \"%s\"",
- ipart, fpart, tmpn, file_name);
- snprintf(buf,4096,"<b>Executing: </b>%s\n",cmd);
- etk_textview_append(Save_TextView, buf);
-
- //Execute edje_cc through a pipe
- eeh1 = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, pipe_data, Save_TextView);
- eeh2 = ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, pipe_data, Save_TextView);
- eeh3 = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, save_pipe_exit, Save_TextView);
- ecore_exe_pipe_run(cmd,
- ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_READ_LINE_BUFFERED |
- ECORE_EXE_PIPE_ERROR | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
- (void*)SAVE_WIN);
-
- return 1; //1 means success
-}
-
-void
-LoadEDJ(char *file)
-{
- create_load_window();
-
- ecore_timer_add(0.1,Decompile,file);
-
- etk_main();
- etk_widget_hide(Load_Win);
-}
-
-int Decompile(void *data)//data is the name of the file to open
-{
- char *file = (char*)data;
- char buf[4096];
- char tmpn[4096];
- char cmd[4096];
- char *old_fname;
- char *ptr;
- char *work_dir = NULL;
-
- progress_bar_timer = ecore_timer_add(0.025,
- (int(*)(void *data))etk_progress_bar_pulse,
- Load_ProgBar);
-
- //TODO Check source integrity (is an edje file?)
- Cur.open_file_name = strdup(file);
-
- //Create working dir
- memset(tmpn, '\0', sizeof(tmpn));
- strcpy(tmpn, "/tmp/edje_editor-tmp-XXXXXX");
-#if defined (__SVR4) && defined (__sun)
- if (mkdir(tmpn, S_IRWXU | S_IRWXG) == NULL)
-#else
- if (mkdtemp(tmpn) == NULL)
-#endif
- {
- snprintf(buf,4096,"<font color=#FF0000><b>Can't create working dir:</b> %s\n<b>Error:</b> %s</font>\n",
- tmpn,strerror(errno));
- etk_textview_append(Load_TextView,buf);
- stop_bar(Load_ProgBar,"Error");
- return 0;
- }
- work_dir = strdup(tmpn);
-
- //Change to the working dir
- snprintf(buf,4096,"<b>Change to working dir:</b> %s\n",work_dir);
- etk_textview_append(Load_TextView,buf);
- getcwd(tmpn, sizeof(tmpn));
- if (chdir(work_dir) == -1)
- {
- snprintf(buf,4096,"<font color=#FF0000><b>Can't change to dir:</b> %s\n<b>Error: </b> %s</font>\n",
- work_dir,strerror(errno));
- etk_textview_append(Load_TextView, buf);
- stop_bar(Load_ProgBar, "Error");
- return 0;
- }
-
- //Calculate Cur.source_dir, image_dir, font_dir, main_source_file
- old_fname = strdup(file);
- ptr = strstr(old_fname, ".edj");
- *ptr = '\0';
- ptr = strrchr(old_fname, '/');
- if (ptr == NULL) ptr = old_fname;
- snprintf(buf,4096,"%s%s",work_dir,ptr);
- Cur.source_dir = strdup(buf);
- snprintf(buf,4096,"%s/"MAIN_EDC_NAME,Cur.source_dir);
- Cur.main_source_file = strdup(buf);
-
- //Execute edje_decc through a pipe
- snprintf(cmd, 4096, "edje_decc \"%s\" -main-out "MAIN_EDC_NAME, file);
- snprintf(buf,4096,"<b>Executing: </b>%s\n",cmd);
- etk_textview_append(Load_TextView, buf);
-
- eeh1 = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, pipe_data, Load_TextView);
- eeh2 = ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, pipe_data, Load_TextView);
- eeh3 = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, load_pipe_exit, NULL);
- ecore_exe_pipe_run(cmd,
- ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_READ_LINE_BUFFERED |
- ECORE_EXE_PIPE_ERROR | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
- (void*)LOAD_WIN);
-
- return 0; //Stop executing timer
-}
-
-int
-pipe_data(void *data, int ev_type, void *ev)//Data is Load_TextView or Save_TextView
-{
- Ecore_Exe_Event_Data *e;
- e = (Ecore_Exe_Event_Data *)ev;
- Etk_Widget* text_view = data;
-
- if (e->lines)
- {
- int i;
- for (i = 0; e->lines[i].line != NULL; i++)
- {
- //printf("++ %d %s\n", e->lines[i].size, e->lines[i].line);
- //Don't show edje_cc malicious warnings
- if (strcmp(e->lines[i].line,"*** CAUTION ***"))
- {
- etk_textview_append(text_view,"<font color=#0000FF>");
- etk_textview_append(text_view,e->lines[i].line);
- etk_textview_append(text_view,"</font>\n");
- }
- else
- i++;
- }
- //etk_textblock_object_yoffset_set(ETK_TEXT_VIEW(LS_TextView)->textblock, -200 );
- }
- return 1;
-}
-
-int
-save_pipe_exit(void *data, int ev_type, void *ev)//Data is LOAD_WIN or SAVE_WIN
-{
- char buf[1024];
- Ecore_Exe_Event_Del *e = (Ecore_Exe_Event_Del *)ev;
-
- if (e->exit_code)
- {
- snprintf(buf,1024,
- "<font color=#FF0000><b>Error in edje_cc, exit code: </b> %d</font>\n",
- e->exit_code);
- stop_bar(Save_ProgBar,"Error");
- }
- else
- {
- snprintf(buf,1024, "<font color=#00AA00><b>Operation completed.</b>\n");
- stop_bar(Save_ProgBar, "Done !!");
- }
-
- etk_textview_append(Save_TextView,buf);
-
- ecore_event_handler_del(eeh1);
- ecore_event_handler_del(eeh2);
- ecore_event_handler_del(eeh3);
-
- return 0;
-}
-
-int
-load_pipe_exit(void *data, int ev_type, void *ev)//Data is LOAD_WIN or SAVE_WIN
-{
- char buf[4096];
- Ecore_Exe_Event_Del *e = (Ecore_Exe_Event_Del *)ev;
+//~ char*
+//~ SaveEDC(char *file_name)
+//~ {
+ //~ //TODO
+ //~ return NULL;
+//~ }
+
+//~ int
+//~ SaveEDJ(char *file_name)
+//~ {
+ //~ char *tmpn;
+ //~ char ipart[1024], fpart[1024];
+ //~ char buf[4096];
+ //~ char cmd[2048];
+ //~ const char *imgdir, *fontdir;
+
+ //~ create_save_window();
+
+ //~ //Start progress_bar
+ //~ progress_bar_timer = ecore_timer_add(0.025,
+ //~ (int(*)(void *data))etk_progress_bar_pulse, Save_ProgBar);
+
+ //~ //backup existing file
+ //~ backup_file(file_name);
+
+ //~ //Create temp edc file
+ //~ tmpn = SaveEDC(NULL); //TODO remove the temp file
+ //~ if (!tmpn)
+ //~ {
+ //~ snprintf(buf,4096,"<font color=#FF0000><b>Can't create edc tmp file:</b> %s\n</font>\n", tmpn);
+ //~ etk_textview_append(Save_TextView,buf);
+ //~ stop_bar(Save_ProgBar,"Error");
+ //~ return 0;
+ //~ }
+
+ //~ snprintf(buf,4096,"<b>Created edc tmp file:</b> %s\n",tmpn);
+ //~ etk_textview_append(Save_TextView,buf);
+
+ //~ //Get image and font directory
+ //~ imgdir = engrave_file_image_dir_get(Cur.ef);
+ //~ fontdir = engrave_file_font_dir_get(Cur.ef);
+ //~ snprintf(buf,4096,"<b>Image dir:</b> %s\n<b>Font dir:</b> %s\n",
+ //~ imgdir,fontdir);
+ //~ etk_textview_append(Save_TextView,buf);
+
+ //~ if (imgdir) snprintf(ipart, sizeof(ipart), "-id %s", imgdir);
+ //~ else ipart[0] = '\0';
+
+ //~ if (fontdir) snprintf(fpart, sizeof(fpart), "-fd %s", fontdir);
+ //~ else fpart[0] = '\0';
+
+ //~ //Create edje_cc command line
+ //~ snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s \"%s\"",
+ //~ ipart, fpart, tmpn, file_name);
+ //~ snprintf(buf,4096,"<b>Executing: </b>%s\n",cmd);
+ //~ etk_textview_append(Save_TextView, buf);
+
+ //~ //Execute edje_cc through a pipe
+ //~ eeh1 = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, pipe_data, Save_TextView);
+ //~ eeh2 = ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, pipe_data, Save_TextView);
+ //~ eeh3 = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, save_pipe_exit, Save_TextView);
+ //~ ecore_exe_pipe_run(cmd,
+ //~ ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+ //~ ECORE_EXE_PIPE_ERROR | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
+ //~ (void*)SAVE_WIN);
+
+ //~ return 1; //1 means success
+//~ }
+
+//~ void
+//~ LoadEDJ(char *file)
+//~ {
+ //~ create_load_window();
+
+ //~ ecore_timer_add(0.1,Decompile,file);
+
+ //~ etk_main();
+ //~ etk_widget_hide(Load_Win);
+//~ }
+
+//~ int Decompile(void *data)//data is the name of the file to open
+//~ {
+ //~ char *file = (char*)data;
+ //~ char buf[4096];
+ //~ char tmpn[4096];
+ //~ char cmd[4096];
+ //~ char *old_fname;
+ //~ char *ptr;
+ //~ char *work_dir = NULL;
+
+ //~ progress_bar_timer = ecore_timer_add(0.025,
+ //~ (int(*)(void *data))etk_progress_bar_pulse,
+ //~ Load_ProgBar);
+
+ //~ //TODO Check source integrity (is an edje file?)
+ //~ Cur.open_file_name = strdup(file);
+
+ //~ //Create working dir
+ //~ memset(tmpn, '\0', sizeof(tmpn));
+ //~ strcpy(tmpn, "/tmp/edje_editor-tmp-XXXXXX");
+//~ #if defined (__SVR4) && defined (__sun)
+ //~ if (mkdir(tmpn, S_IRWXU | S_IRWXG) == NULL)
+//~ #else
+ //~ if (mkdtemp(tmpn) == NULL)
+//~ #endif
+ //~ {
+ //~ snprintf(buf,4096,"<font color=#FF0000><b>Can't create working dir:</b> %s\n<b>Error:</b> %s</font>\n",
+ //~ tmpn,strerror(errno));
+ //~ etk_textview_append(Load_TextView,buf);
+ //~ stop_bar(Load_ProgBar,"Error");
+ //~ return 0;
+ //~ }
+ //~ work_dir = strdup(tmpn);
+
+ //~ //Change to the working dir
+ //~ snprintf(buf,4096,"<b>Change to working dir:</b> %s\n",work_dir);
+ //~ etk_textview_append(Load_TextView,buf);
+ //~ getcwd(tmpn, sizeof(tmpn));
+ //~ if (chdir(work_dir) == -1)
+ //~ {
+ //~ snprintf(buf,4096,"<font color=#FF0000><b>Can't change to dir:</b> %s\n<b>Error: </b> %s</font>\n",
+ //~ work_dir,strerror(errno));
+ //~ etk_textview_append(Load_TextView, buf);
+ //~ stop_bar(Load_ProgBar, "Error");
+ //~ return 0;
+ //~ }
+
+ //~ //Calculate Cur.source_dir, image_dir, font_dir, main_source_file
+ //~ old_fname = strdup(file);
+ //~ ptr = strstr(old_fname, ".edj");
+ //~ *ptr = '\0';
+ //~ ptr = strrchr(old_fname, '/');
+ //~ if (ptr == NULL) ptr = old_fname;
+ //~ snprintf(buf,4096,"%s%s",work_dir,ptr);
+ //~ Cur.source_dir = strdup(buf);
+ //~ snprintf(buf,4096,"%s/"MAIN_EDC_NAME,Cur.source_dir);
+ //~ Cur.main_source_file = strdup(buf);
+
+ //~ //Execute edje_decc through a pipe
+ //~ snprintf(cmd, 4096, "edje_decc \"%s\" -main-out "MAIN_EDC_NAME, file);
+ //~ snprintf(buf,4096,"<b>Executing: </b>%s\n",cmd);
+ //~ etk_textview_append(Load_TextView, buf);
+
+ //~ eeh1 = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, pipe_data, Load_TextView);
+ //~ eeh2 = ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, pipe_data, Load_TextView);
+ //~ eeh3 = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, load_pipe_exit, NULL);
+ //~ ecore_exe_pipe_run(cmd,
+ //~ ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+ //~ ECORE_EXE_PIPE_ERROR | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
+ //~ (void*)LOAD_WIN);
+
+ //~ return 0; //Stop executing timer
+//~ }
+
+//~ int
+//~ pipe_data(void *data, int ev_type, void *ev)//Data is Load_TextView or Save_TextView
+//~ {
+ //~ Ecore_Exe_Event_Data *e;
+ //~ e = (Ecore_Exe_Event_Data *)ev;
+ //~ Etk_Widget* text_view = data;
+
+ //~ if (e->lines)
+ //~ {
+ //~ int i;
+ //~ for (i = 0; e->lines[i].line != NULL; i++)
+ //~ {
+ //~ //printf("++ %d %s\n", e->lines[i].size, e->lines[i].line);
+ //~ //Don't show edje_cc malicious warnings
+ //~ if (strcmp(e->lines[i].line,"*** CAUTION ***"))
+ //~ {
+ //~ etk_textview_append(text_view,"<font color=#0000FF>");
+ //~ etk_textview_append(text_view,e->lines[i].line);
+ //~ etk_textview_append(text_view,"</font>\n");
+ //~ }
+ //~ else
+ //~ i++;
+ //~ }
+ //~ //etk_textblock_object_yoffset_set(ETK_TEXT_VIEW(LS_TextView)->textblock, -200 );
+ //~ }
+ //~ return 1;
+//~ }
+
+//~ int
+//~ save_pipe_exit(void *data, int ev_type, void *ev)//Data is LOAD_WIN or SAVE_WIN
+//~ {
+ //~ char buf[1024];
+ //~ Ecore_Exe_Event_Del *e = (Ecore_Exe_Event_Del *)ev;
+
+ //~ if (e->exit_code)
+ //~ {
+ //~ snprintf(buf,1024,
+ //~ "<font color=#FF0000><b>Error in edje_cc, exit code: </b> %d</font>\n",
+ //~ e->exit_code);
+ //~ stop_bar(Save_ProgBar,"Error");
+ //~ }
+ //~ else
+ //~ {
+ //~ snprintf(buf,1024, "<font color=#00AA00><b>Operation completed.</b>\n");
+ //~ stop_bar(Save_ProgBar, "Done !!");
+ //~ }
+
+ //~ etk_textview_append(Save_TextView,buf);
+
+ //~ ecore_event_handler_del(eeh1);
+ //~ ecore_event_handler_del(eeh2);
+ //~ ecore_event_handler_del(eeh3);
+
+ //~ return 0;
+//~ }
+
+//~ int
+//~ load_pipe_exit(void *data, int ev_type, void *ev)//Data is LOAD_WIN or SAVE_WIN
+//~ {
+ //~ char buf[4096];
+ //~ Ecore_Exe_Event_Del *e = (Ecore_Exe_Event_Del *)ev;
- if (e->exit_code)
- {
- snprintf(buf,sizeof(buf),"<font color=#FF0000><b>Error in edje_decc, exit code: </b> %d</font>\n",
- e->exit_code);
- etk_textview_append(data,buf);
- stop_bar(Load_ProgBar, "Error");
- }
- else
- {
- Cur.ef = engrave_load_edc(Cur.main_source_file,
- Cur.source_dir, Cur.source_dir);
- if (!Cur.ef)
- {
- //TODO catch the engrave error and display it.
- etk_textview_append(Load_TextView,"<font color=#FF0000><b>Error parsing edc file. See terminal output for more information.</b></font>\n");
- stop_bar(Load_ProgBar, "Error");
- }
- else
- {
- etk_textview_append(Load_TextView,
- "<font color=#00AA00><b>Operation completed.</b>\n");
+ //~ if (e->exit_code)
+ //~ {
+ //~ snprintf(buf,sizeof(buf),"<font color=#FF0000><b>Error in edje_decc, exit code: </b> %d</font>\n",
+ //~ e->exit_code);
+ //~ etk_textview_append(data,buf);
+ //~ stop_bar(Load_ProgBar, "Error");
+ //~ }
+ //~ else
+ //~ {
+ //~ Cur.ef = engrave_load_edc(Cur.main_source_file,
+ //~ Cur.source_dir, Cur.source_dir);
+ //~ if (!Cur.ef)
+ //~ {
+ //~ //TODO catch the engrave error and display it.
+ //~ etk_textview_append(Load_TextView,"<font color=#FF0000><b>Error parsing edc file. See terminal output for more information.</b></font>\n");
+ //~ stop_bar(Load_ProgBar, "Error");
+ //~ }
+ //~ else
+ //~ {
+ //~ etk_textview_append(Load_TextView,
+ //~ "<font color=#00AA00><b>Operation completed.</b>\n");
- snprintf(buf,sizeof(buf),"<b>Main source file:</b> %s\n",
- Cur.main_source_file);
- etk_textview_append(Load_TextView, buf);
-
- snprintf(buf,sizeof(buf),"<b>Source dir:</b> %s\n",Cur.source_dir);
- etk_textview_append(Load_TextView, buf);
-
- snprintf(buf,sizeof(buf),"<b>Image dir:</b> %s\n",
- engrave_file_image_dir_get(Cur.ef));
- etk_textview_append(Load_TextView, buf);
-
- snprintf(buf,sizeof(buf),"<b>Font dir:</b> %s</font>\n",
- engrave_file_font_dir_get(Cur.ef));
- etk_textview_append(Load_TextView, buf);
+ //~ snprintf(buf,sizeof(buf),"<b>Main source file:</b> %s\n",
+ //~ Cur.main_source_file);
+ //~ etk_textview_append(Load_TextView, buf);
+
+ //~ snprintf(buf,sizeof(buf),"<b>Source dir:</b> %s\n",Cur.source_dir);
+ //~ etk_textview_append(Load_TextView, buf);
+
+ //~ snprintf(buf,sizeof(buf),"<b>Image dir:</b> %s\n",
+ //~ engrave_file_image_dir_get(Cur.ef));
+ //~ etk_textview_append(Load_TextView, buf);
+
+ //~ snprintf(buf,sizeof(buf),"<b>Font dir:</b> %s</font>\n",
+ //~ engrave_file_font_dir_get(Cur.ef));
+ //~ etk_textview_append(Load_TextView, buf);
- stop_bar(Load_ProgBar, "Done !!");
- }
- }
- ecore_event_handler_del(eeh1);
- ecore_event_handler_del(eeh2);
- ecore_event_handler_del(eeh3);
- return 0;
-}
-
-void
-stop_bar(Etk_Widget* pbar, char *text)
-{
- ecore_timer_del(progress_bar_timer);
- etk_progress_bar_text_set (ETK_PROGRESS_BAR(pbar), text);
- etk_progress_bar_fraction_set (ETK_PROGRESS_BAR(pbar), 1.0);
-}
+ //~ stop_bar(Load_ProgBar, "Done !!");
+ //~ }
+ //~ }
+ //~ ecore_event_handler_del(eeh1);
+ //~ ecore_event_handler_del(eeh2);
+ //~ ecore_event_handler_del(eeh3);
+ //~ return 0;
+//~ }
+
+//~ void
+//~ stop_bar(Etk_Widget* pbar, char *text)
+//~ {
+ //~ ecore_timer_del(progress_bar_timer);
+ //~ etk_progress_bar_text_set (ETK_PROGRESS_BAR(pbar), text);
+ //~ etk_progress_bar_fraction_set (ETK_PROGRESS_BAR(pbar), 1.0);
+//~ }
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/inout.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- inout.h 26 Nov 2007 03:36:07 -0000 1.4
+++ inout.h 15 Feb 2008 21:41:21 -0000 1.5
@@ -1,6 +1,6 @@
#include "main.h"
-void LoadEDJ (char *file);
+//void LoadEDJ (char *file);
int SaveEDJ (char *file_name);
char* SaveEDC (char *file_name);
int Decompile (void *data); //data is the name of the file to open
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- interface.c 7 Feb 2008 17:29:53 -0000 1.52
+++ interface.c 15 Feb 2008 21:41:21 -0000 1.53
@@ -1,38 +1,71 @@
#include <dirent.h>
#include <string.h>
#include <Edje.h>
+#include <Edje_Edit.h>
#include <Etk.h>
#include "main.h"
#include "callbacks.h"
#include "interface.h"
#include "evas.h"
-#if TEST_DIRECT_EDJE
- #include <Edje_Edit.h>
-#endif
-
-static Evas_Object *logo;
-
-
void
ShowAlert(char* text)
{
- etk_message_dialog_text_set (ETK_MESSAGE_DIALOG(UI_AlertDialog), text);
+ etk_message_dialog_text_set(ETK_MESSAGE_DIALOG(UI_AlertDialog), text);
etk_widget_show_all(UI_AlertDialog);
}
-/* functions to update interface*/
-
-#if TEST_DIRECT_EDJE
void
-AddPartToTree2(char *part_name)//, char *group_name)//, int place_after, Engrave_Part* after)
+ShowFilechooser(int FileChooserType)
{
- Etk_Tree_Row *row=NULL;
+ etk_widget_show_all(UI_FileChooserDialog);
+
+ FileChooserOperation = FileChooserType;
+ switch(FileChooserType){
+ case FILECHOOSER_OPEN:
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an EDJ or EDC file to open");
+ etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_FALSE);
+ etk_widget_hide(UI_FilechooserSaveButton);
+ break;
+ case FILECHOOSER_IMAGE:
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an image to import");
+ etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_FALSE);
+ etk_widget_hide(UI_FilechooserSaveButton);
+ break;
+ case FILECHOOSER_FONT:
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an font to import");
+ etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_FALSE);
+ etk_widget_hide(UI_FilechooserSaveButton);
+ break;
+ case FILECHOOSER_SAVE_EDJ:
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the new edje name");
+ etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_TRUE);
+ etk_widget_hide(UI_FilechooserLoadButton);
+ break;
+ case FILECHOOSER_SAVE_EDC:
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the new edc name");
+ etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_TRUE);
+ etk_widget_hide(UI_FilechooserLoadButton);
+ break;
+ default:
+ break;
+ }
+}
+/***********************************
+ *
+ * functions to update interface
+ *
+ ***********************************/
+Etk_Tree_Row *
+AddPartToTree(const char *part_name)//, char *group_name)//, int place_after, Engrave_Part* after)
+{
+ Etk_Tree_Row *row = NULL;
char buf[20];
//printf("Add Part to tree: %s\n",par->name);
- switch (edje_edit_part_type_get(edje_o ,part_name)){
+ switch (edje_edit_part_type_get(edje_o ,part_name))
+ {
case EDJE_PART_TYPE_IMAGE: strcpy(buf,"IMAGE.PNG"); break;
case EDJE_PART_TYPE_TEXT: strcpy(buf,"TEXT.PNG"); break;
case EDJE_PART_TYPE_RECTANGLE: strcpy(buf,"RECT.PNG"); break;
@@ -47,18 +80,20 @@
COL_TYPE,ROW_PART,
NULL);
else*/
- row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
- NULL,
- COL_NAME, EdjeFile,buf, part_name,
- COL_TYPE, ROW_PART,
- NULL);
+ row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
+ NULL,
+ COL_NAME, EdjeFile,buf, part_name,
+ COL_TYPE, ROW_PART,
+ NULL);
Parts_Hash = evas_hash_add(Parts_Hash, part_name, row);
//etk_tree_row_data_set(row, part_name);
+
+ return row;
}
-void
-AddStateToTree2(char *part_name, char *state_name)
+Etk_Tree_Row *
+AddStateToTree(const char *part_name, const char *state_name)
{
Etk_Tree_Row *row;
@@ -71,102 +106,13 @@
COL_VIS, TRUE,
COL_TYPE, ROW_DESC,
COL_PARENT, part_name, NULL);
+ return row;
}
-#endif
-void
-AddGroupToTree(Engrave_Group* group)
+Etk_Tree_Row *
+AddProgramToTree(const char* prog)
{
- Etk_Tree_Row *row=NULL;
-
- row = etk_tree_row_append(ETK_TREE(UI_PartsTree), NULL,
- COL_NAME, EdjeFile,"NONE.PNG", group->name,
- COL_TYPE,ROW_GROUP, NULL);
-
- ecore_hash_set (hash, group, row);
- etk_tree_row_data_set(row,group);
-}
-
-void
-AddPartToTree(Engrave_Part* part, int place_after, Engrave_Part* after)
-{
- Etk_Tree_Row *row=NULL;
- char buf[20];
-
- //printf("Add Part to tree: %s\n",par->name);
-
-
- switch (part->type){
- case ENGRAVE_PART_TYPE_IMAGE: strcpy(buf,"IMAGE.PNG"); break;
- case ENGRAVE_PART_TYPE_TEXT: strcpy(buf,"TEXT.PNG"); break;
- case ENGRAVE_PART_TYPE_RECT: strcpy(buf,"RECT.PNG"); break;
- default: strcpy(buf,"NONE.PNG"); break;
- }
-
- if (place_after)
- row = etk_tree_row_insert(ETK_TREE(UI_PartsTree),
- ecore_hash_get(hash,part->parent),
- ecore_hash_get(hash,after),
- COL_NAME, EdjeFile,buf, part->name,
- COL_TYPE,ROW_PART,
- NULL);
- else
- row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
- ecore_hash_get(hash,part->parent),
- COL_NAME, EdjeFile,buf, part->name,
- COL_TYPE,ROW_PART,
- NULL);
-
- ecore_hash_set(hash, part, row);
- etk_tree_row_data_set(row, part);
-}
-
-void
-AddStateToTree(Engrave_Part_State* state)
-{
- Etk_Tree_Row *row;
- Etk_String *str = etk_string_new("");
- char buf[4096];
- const char *stock_key;
-
- snprintf(buf,4096,"%s %.2f",state->name,state->value);
- stock_key = etk_stock_key_get(ETK_STOCK_TEXT_X_GENERIC, ETK_STOCK_SMALL);
- row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
- ecore_hash_get(hash,state->parent),
- COL_NAME,EdjeFile,"DESC.PNG",buf,
- COL_VIS,TRUE,
- COL_TYPE,ROW_DESC, NULL);
-
- etk_tree_row_data_set (row, state);
- ecore_hash_set(hash, state, row);
-
-
- etk_object_destroy(ETK_OBJECT(str));
-
-}
-
-void
-AddProgramToTree(Engrave_Program* prog)
-{
- Etk_Tree_Row *row=NULL;
-
- //printf("Add Program to tree: %s\n",prog->name);
-
- //TODO: place the prog after all the parts
- row = etk_tree_row_append(ETK_TREE(UI_PartsTree),
- ecore_hash_get(hash,prog->parent),
- COL_NAME, EdjeFile,"PROG.PNG", prog->name,
- COL_TYPE,ROW_PROG,
- NULL);
-
- ecore_hash_set(hash, prog, row);
- etk_tree_row_data_set(row, prog);
-}
-#if TEST_DIRECT_EDJE
-void
-AddProgramToTree2(const char* prog)
-{
- Etk_Tree_Row *row=NULL;
+ Etk_Tree_Row *row = NULL;
//printf("Add Program to tree: %s\n",prog->name);
@@ -178,25 +124,27 @@
NULL);
//ecore_hash_set(hash, prog, row);
+ return row;
}
void
-PopulateTree2(void)
+PopulateTree(void)
{
Evas_List *parts, *pp;
Evas_List *states, *sp;
Evas_List *progs;
+ etk_tree_freeze(ETK_TREE(UI_PartsTree));
etk_tree_clear(ETK_TREE(UI_PartsTree));
parts = pp = edje_edit_parts_list_get(edje_o);
while(pp)
{
printf(" P: %s\n", (char*)pp->data);
- AddPartToTree2((char*)pp->data);
+ AddPartToTree((char*)pp->data);
states = sp = edje_edit_part_states_list_get(edje_o, (char*)pp->data);
while(sp)
{
- AddStateToTree2((char*)pp->data, (char*)sp->data);
+ AddStateToTree((char*)pp->data, (char*)sp->data);
sp = sp->next;
}
edje_edit_string_list_free(states);
@@ -207,15 +155,17 @@
progs = pp = edje_edit_programs_list_get(edje_o);
while(pp)
{
- AddProgramToTree2((char*)pp->data);
+ AddProgramToTree((char*)pp->data);
pp = pp->next;
}
edje_edit_string_list_free(progs);
etk_tree_row_select(etk_tree_first_row_get (ETK_TREE(UI_PartsTree)));
+ etk_tree_thaw(ETK_TREE(UI_PartsTree));
+
}
-void
-PopulateGroupsComboBox()
+void
+PopulateGroupsComboBox(void)
{
Evas_List *groups, *l;
@@ -232,56 +182,22 @@
etk_signal_unblock("item-activated",ETK_OBJECT(UI_GroupsComboBox), on_GroupsComboBox_activated, NULL);
etk_combobox_active_item_set(ETK_COMBOBOX(UI_GroupsComboBox),
- etk_combobox_first_item_get (ETK_COMBOBOX(UI_GroupsComboBox)));
+ etk_combobox_first_item_get(ETK_COMBOBOX(UI_GroupsComboBox)));
}
-#else
-void
-PopulateTree(void)
-{
- Engrave_Group *group;
- Engrave_Part *part;
- Engrave_Part_State *state;
- Engrave_Program *prog;
- Evas_List *gp,*pp,*sp,*progp;
-
- for (gp = Cur.ef->groups; gp ;gp = gp->next)
- {
- group = gp->data;
- AddGroupToTree(group);
- for (pp = group->parts; pp ;pp = pp->next)
- {
- part = pp->data;
- AddPartToTree(part, 0, NULL);
- for (sp = part->states; sp; sp = sp->next)
- {
- state = sp->data;
- AddStateToTree(state);
- // printf(" ** State: %s \n",sta->name);
- }
- }
- for (progp = group->programs; progp; progp = progp->next)
- {
- prog = progp->data;
- AddProgramToTree(prog);
- }
- }
-}
-#endif
void
PopulateFontsComboBox(void)
{
Evas_List *l;
- Engrave_Font *ef;
Etk_Combobox_Item *ComboItem;
//Stop signal propagation
- etk_signal_disconnect("active-item-changed", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_changed), NULL);
+ etk_signal_disconnect("item-activated", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
printf("Populate Fonts Combo\n");
etk_combobox_clear(ETK_COMBOBOX(UI_FontComboBox));
-#if TEST_DIRECT_EDJE
+
Evas_List *fonts;
fonts = l = edje_edit_fonts_list_get(edje_o);
while (l)
@@ -292,40 +208,27 @@
l = l->next;
}
edje_edit_string_list_free(fonts);
-#else
- for (l = Cur.ef->fonts; l ; l = l->next)
- {
- ef = l->data;
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_FontComboBox),
- etk_image_new_from_stock (ETK_STOCK_PREFERENCES_DESKTOP_FONT,ETK_STOCK_SMALL),
- engrave_font_name_get (ef));
- etk_combobox_item_data_set (ComboItem, ef);
- }
-#endif
+
//Renable signal propagation
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_changed), NULL);
+ etk_signal_connect("item-activated", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
}
void
PopulateImagesComboBox(void)
{
- Engrave_Image *image;
Evas_List *images, *l;
Etk_Combobox_Item *ComboItem;
char buf[4096];
//Stop signal propagation
- etk_signal_disconnect("active-item-changed", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_changed), NULL);
-
+ etk_signal_block("item-activated", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
+
printf("Populate Images Combobox\n");
etk_combobox_clear(ETK_COMBOBOX(UI_ImageComboBox));
-
-#if TEST_DIRECT_EDJE
-
images = l = edje_edit_images_list_get(edje_o);
while (l)
{
@@ -336,30 +239,16 @@
l = l->next;
}
edje_edit_string_list_free(images);
-#else
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_ImageComboBox),
- NULL, "<b>Choose an image</b>");
- etk_combobox_item_data_set (ComboItem, NULL);
-
- for (l = Cur.ef->images; l ; l = l->next)
- {
- image = l->data;
- snprintf(buf,4095,"%s/%s",Cur.ef->im_dir,image->name);
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_ImageComboBox),
- etk_image_new_from_file (buf, NULL), image->name);
- etk_combobox_item_data_set (ComboItem, image);
- }
-#endif
+
//Renable signal propagation
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_changed), NULL);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
}
void
PopulateRelComboBoxes(void)
{
Evas_List *l;
- Etk_Combobox_Item *ComboItem;
- Engrave_Part* part = NULL;
+
char buf[20];
printf("Populate 4 Rel Comboboxs\n");
//Stop signal propagation
@@ -373,7 +262,7 @@
etk_combobox_clear(ETK_COMBOBOX(UI_Rel1ToYComboBox));
etk_combobox_clear(ETK_COMBOBOX(UI_Rel2ToXComboBox));
etk_combobox_clear(ETK_COMBOBOX(UI_Rel2ToYComboBox));
-#if TEST_DIRECT_EDJE
+
if (etk_string_length_get(Cur.group))
{
// Add first element 'Interface' to all the 4 combobox
@@ -408,54 +297,23 @@
else snprintf(buf, 19,"NONE.PNG");
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox),
- etk_image_new_from_edje (EdjeFile,buf),
+ etk_image_new_from_edje(EdjeFile,buf),
(char *)l->data);
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToYComboBox),
- etk_image_new_from_edje (EdjeFile,buf),
+ etk_image_new_from_edje(EdjeFile,buf),
(char *)l->data);
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToXComboBox),
- etk_image_new_from_edje (EdjeFile,buf),
+ etk_image_new_from_edje(EdjeFile,buf),
(char *)l->data);
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToYComboBox),
- etk_image_new_from_edje (EdjeFile,buf),
+ etk_image_new_from_edje(EdjeFile,buf),
(char *)l->data);
l = l->next;
}
edje_edit_string_list_free(parts);
}
-#else
- if (Cur.eg)
- {
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox), etk_image_new_from_edje (EdjeFile,"NONE.PNG"),"Interface");
- etk_combobox_item_data_set (ComboItem, (void *)REL_COMBO_INTERFACE);
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToYComboBox),etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Interface");
- etk_combobox_item_data_set (ComboItem, (void *)REL_COMBO_INTERFACE);
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToXComboBox), etk_image_new_from_edje (EdjeFile,"NONE.PNG"),"Interface");
- etk_combobox_item_data_set (ComboItem, (void *)REL_COMBO_INTERFACE);
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToYComboBox),etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Interface");
- etk_combobox_item_data_set (ComboItem, (void *)REL_COMBO_INTERFACE);
- for (l = Cur.eg->parts; l; l = l->next)
- {
- part = l->data;
- if (part->type == ENGRAVE_PART_TYPE_RECT)
- snprintf(buf, 19,"RECT.PNG");
- if (part->type == ENGRAVE_PART_TYPE_TEXT)
- snprintf(buf, 19,"TEXT.PNG");
- if (part->type == ENGRAVE_PART_TYPE_IMAGE)
- snprintf(buf, 19,"IMAGE.PNG");
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToXComboBox),etk_image_new_from_edje (EdjeFile,buf), part->name);
- etk_combobox_item_data_set (ComboItem, part);
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel1ToYComboBox),etk_image_new_from_edje (EdjeFile,buf), part->name);
- etk_combobox_item_data_set (ComboItem, part);
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToXComboBox),etk_image_new_from_edje (EdjeFile,buf), part->name);
- etk_combobox_item_data_set (ComboItem, part);
- ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToYComboBox), etk_image_new_from_edje (EdjeFile,buf),part->name);
- etk_combobox_item_data_set (ComboItem, part);
- }
- }
-#endif
//Reenable signal propagation
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1X_SPINNER);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1Y_SPINNER);
@@ -482,13 +340,13 @@
ep = l->data;
if (ep->type == ENGRAVE_PART_TYPE_RECT)
etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
- etk_image_new_from_edje (EdjeFile,"RECT.PNG"),ep->name);
+ etk_image_new_from_edje(EdjeFile,"RECT.PNG"),ep->name);
if (ep->type == ENGRAVE_PART_TYPE_TEXT)
etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
- etk_image_new_from_edje (EdjeFile,"TEXT.PNG"),ep->name);
+ etk_image_new_from_edje(EdjeFile,"TEXT.PNG"),ep->name);
if (ep->type == ENGRAVE_PART_TYPE_IMAGE)
etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
- etk_image_new_from_edje (EdjeFile,"IMAGE.PNG"),ep->name);
+ etk_image_new_from_edje(EdjeFile,"IMAGE.PNG"),ep->name);
}
//Renable signal propagation
@@ -496,21 +354,19 @@
ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
}
-#if TEST_DIRECT_EDJE
+
void
PupulateTweenList(void)
{
Evas_List *tweens, *l;
Etk_Tree_Col *col;
- col = etk_tree_nth_col_get (ETK_TREE(UI_ImageTweenList), 0);
+ 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;
-
-
tweens = l = edje_edit_state_tweens_list_get(edje_o, Cur.part->string, Cur.state->string);
while (l)
{
@@ -523,41 +379,7 @@
}
edje_edit_string_list_free(tweens);
}
-#else
-void
-PupulateTweenList(void)
-{
- char buf[4096];
- Engrave_Image *im;
- Etk_Tree_Row *row;
- Evas_List *l;
- int row_num = 1;
- Etk_Tree_Col *col1 = etk_tree_nth_col_get (ETK_TREE(UI_ImageTweenList),0);
-
- etk_tree_clear(ETK_TREE(UI_ImageTweenList));
- if (Cur.eps->image.normal)
- {
- snprintf(buf,4095,"%s/%s",Cur.ef->im_dir,Cur.eps->image.normal->name);
- etk_tree_row_append(ETK_TREE(UI_ImageTweenList), NULL,
- col1, buf, NULL,Cur.eps->image.normal->name,
- NULL);
- }
- // for all the frame in the tween
- for (l = Cur.eps->image.tween; l; l = l->next)
- {
- im = l->data;
- snprintf(buf,4095,"%s/%s",Cur.ef->im_dir,im->name);
- row = etk_tree_row_append(ETK_TREE(UI_ImageTweenList), NULL,
- col1, buf, NULL,im->name,
- NULL);
- etk_tree_row_data_set(row,(void*)row_num);
- row_num++;
- }
- etk_widget_disabled_set(UI_DeleteTweenButton,TRUE);
- etk_widget_disabled_set(UI_MoveUpTweenButton,TRUE);
- etk_widget_disabled_set(UI_MoveDownTweenButton,TRUE);
-}
-#endif
+
void
UpdateGroupFrame(void)
{
@@ -568,7 +390,6 @@
etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxWSpinner), ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MAXW_SPINNER);
etk_signal_block("value-changed", ETK_OBJECT(UI_GroupMaxHSpinner), ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MAXH_SPINNER);
-#if TEST_DIRECT_EDJE
//Update name
etk_entry_text_set(ETK_ENTRY(UI_GroupNameEntry),Cur.group->string);
@@ -581,17 +402,6 @@
etk_range_value_set(ETK_RANGE(UI_GroupMaxWSpinner), (float)w);
etk_range_value_set(ETK_RANGE(UI_GroupMaxHSpinner), (float)h);
-#else
- //Update name
- etk_entry_text_set(ETK_ENTRY(UI_GroupNameEntry),Cur.eg->name);
-
- //Update min e max spinners
- etk_range_value_set (ETK_RANGE(UI_GroupMinWSpinner), Cur.eg->min.w);
- etk_range_value_set (ETK_RANGE(UI_GroupMinHSpinner), Cur.eg->min.h);
- etk_range_value_set (ETK_RANGE(UI_GroupMaxWSpinner), Cur.eg->max.w);
- etk_range_value_set (ETK_RANGE(UI_GroupMaxHSpinner), Cur.eg->max.h);
-#endif
-
//ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_GroupNameEntry),on_GroupNameEntry_text_changed, NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_GroupMinWSpinner), ETK_CALLBACK(on_GroupSpinner_value_changed), (void *)MINW_SPINNER);
@@ -612,7 +422,6 @@
etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
on_PartEventsRepeatCheck_toggled, NULL);
-#if TEST_DIRECT_EDJE
if (etk_string_length_get(Cur.part))
{
etk_entry_text_set(ETK_ENTRY(UI_PartNameEntry), Cur.part->string);
@@ -621,16 +430,6 @@
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_PartEventsRepeatCheck),
edje_edit_part_repeat_events_get(edje_o, Cur.part->string));
}
-#else
- if (Cur.ep){
- //printf("Update Part Frame: %s\n",Cur.ep->name);
-
- //Update Part
- etk_entry_text_set(ETK_ENTRY(UI_PartNameEntry),Cur.ep->name);
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_PartEventsCheck),
- Cur.ep->mouse_events);
- }
-#endif
//ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_PartNameEntry),
@@ -658,7 +457,6 @@
etk_signal_block("value-changed",ETK_OBJECT(UI_StateAlignVSpinner),ETK_CALLBACK(on_FontAlignSpinner_value_changed), (void*)STATE_ALIGNV_SPINNER);
etk_signal_block("value-changed",ETK_OBJECT(UI_StateAlignHSpinner),ETK_CALLBACK(on_FontAlignSpinner_value_changed), (void*)STATE_ALIGNH_SPINNER);
-#if TEST_DIRECT_EDJE
if (etk_string_length_get(Cur.state))
{
//Set description name & index
@@ -672,7 +470,7 @@
//Set aspect pref Combo
etk_combobox_active_item_set(ETK_COMBOBOX(UI_AspectComboBox),
- etk_combobox_nth_item_get (ETK_COMBOBOX(UI_AspectComboBox),
+ etk_combobox_nth_item_get(ETK_COMBOBOX(UI_AspectComboBox),
edje_edit_state_aspect_pref_get(edje_o, Cur.part->string, Cur.state->string)));
//Set min e max size
@@ -692,47 +490,8 @@
etk_range_value_set(ETK_RANGE(UI_StateAlignVSpinner),
edje_edit_state_align_y_get(edje_o, Cur.part->string, Cur.state->string));
}
-#else
- if (Cur.eps)
- {
- const char *name;
- double index;
- double aspect_min;
- double aspect_max;
- int minw,minh,maxw,maxh;
- double h, v;
-
- //printf("Update Description Frame: %s\n",Cur.eps->name);
-
- //Set description name & index
- name = engrave_part_state_name_get(Cur.eps,&index);
- etk_entry_text_set(ETK_ENTRY(UI_StateEntry),name);
- etk_range_value_set(ETK_RANGE(UI_StateIndexSpinner), index);
- //Set aspect min & max
- engrave_part_state_aspect_get(Cur.eps, &aspect_min, &aspect_max);
- etk_range_value_set(ETK_RANGE(UI_AspectMinSpinner), aspect_min);
- etk_range_value_set(ETK_RANGE(UI_AspectMaxSpinner), aspect_max);
-
- //Set aspect pref Combo
- etk_combobox_active_item_set(ETK_COMBOBOX(UI_AspectComboBox),
- etk_combobox_nth_item_get (ETK_COMBOBOX(UI_AspectComboBox),
- engrave_part_state_aspect_preference_get(Cur.eps)));
-
- //Set min e max size
- engrave_part_state_min_size_get(Cur.eps, &minw, &minh);
- engrave_part_state_max_size_get(Cur.eps, &maxw, &maxh);
- etk_range_value_set(ETK_RANGE(UI_StateMinWSpinner), minw);
- etk_range_value_set(ETK_RANGE(UI_StateMinHSpinner), minh);
- etk_range_value_set(ETK_RANGE(UI_StateMaxWSpinner), maxw);
- etk_range_value_set(ETK_RANGE(UI_StateMaxHSpinner), maxh);
-
- engrave_part_state_align_get(Cur.eps, &h, &v);
- etk_range_value_set (ETK_RANGE(UI_StateAlignHSpinner), h);
- etk_range_value_set (ETK_RANGE(UI_StateAlignVSpinner), v);
- }
-#endif
- //ReEnable Signal Propagation
+ //ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_StateEntry),on_StateEntry_text_changed, NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateIndexSpinner), ETK_CALLBACK(on_StateIndexSpinner_value_changed), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_AspectMinSpinner), ETK_CALLBACK(on_AspectSpinner_value_changed), NULL);
@@ -751,7 +510,7 @@
UpdateRectFrame(void)
{
Etk_Color color;
-#if TEST_DIRECT_EDJE
+
if (etk_string_length_get(Cur.state))
{
edje_edit_state_color_get(edje_o, Cur.part->string, Cur.state->string,
@@ -767,35 +526,15 @@
etk_signal_unblock("color-changed", ETK_OBJECT(UI_ColorPicker), ETK_CALLBACK(on_ColorDialog_change), NULL);
}
-#else
- if (Cur.eps){
- printf("Update Rect Frame: %s (%d %d %d %d)\n",Cur.eps->name,Cur.eps->color.r,Cur.eps->color.g,Cur.eps->color.b,Cur.eps->color.a);
-
- etk_signal_block("color-changed", ETK_OBJECT(UI_ColorPicker), ETK_CALLBACK(on_ColorDialog_change), NULL);
-
- //Set ColorPicker
- color.r = Cur.eps->color.r;
- color.g = Cur.eps->color.g;
- color.b = Cur.eps->color.b;
- color.a = Cur.eps->color.a;
- etk_colorpicker_current_color_set (ETK_COLORPICKER(UI_ColorPicker), color);
- //Set Color rect
- evas_color_argb_premul(color.a,&color.r,&color.g,&color.b);
- evas_object_color_set(RectColorObject,color.r,color.g,color.b,color.a);
-
- etk_signal_unblock("color-changed", ETK_OBJECT(UI_ColorPicker), ETK_CALLBACK(on_ColorDialog_change), NULL);
- }
-#endif
}
void
UpdateImageFrame(void)
{
- Engrave_Image *image;
- int i;
Etk_Combobox_Item *item = NULL;
- char *im, *pi;
+ char *im;
+ const char *pi;
//Stop signal propagation
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderLeftSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed), (void*)BORDER_LEFT);
@@ -803,8 +542,7 @@
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderTopSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed), (void*)BORDER_TOP);
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderBottomSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed), (void*)BORDER_BOTTOM);
etk_signal_block("value-changed",ETK_OBJECT(UI_ImageAlphaSlider),ETK_CALLBACK(on_ImageAlphaSlider_value_changed), NULL);
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_changed), NULL);
-#if TEST_DIRECT_EDJE
+ etk_signal_block("item-activated", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
@@ -824,7 +562,7 @@
if (strcmp(im,pi) == 0)
{
//Found the item set active
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_ImageComboBox),item);
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_ImageComboBox),item);
break;
}
item = etk_combobox_item_next_get(item);
@@ -841,84 +579,32 @@
NULL, NULL, NULL, &alpha);
edje_edit_state_image_border_get(edje_o, Cur.part->string, Cur.state->string,
&l, &r, &t, &b);
- etk_range_value_set (ETK_RANGE(UI_ImageAlphaSlider), alpha);
- etk_range_value_set (ETK_RANGE(UI_BorderLeftSpinner), l);
- etk_range_value_set (ETK_RANGE(UI_BorderRightSpinner), r);
- etk_range_value_set (ETK_RANGE(UI_BorderTopSpinner), t);
- etk_range_value_set (ETK_RANGE(UI_BorderBottomSpinner), b);
+ etk_range_value_set(ETK_RANGE(UI_ImageAlphaSlider), alpha);
+ etk_range_value_set(ETK_RANGE(UI_BorderLeftSpinner), l);
+ etk_range_value_set(ETK_RANGE(UI_BorderRightSpinner), r);
+ etk_range_value_set(ETK_RANGE(UI_BorderTopSpinner), t);
+ etk_range_value_set(ETK_RANGE(UI_BorderBottomSpinner), b);
-#else
- PupulateTweenList();
-
- if (Cur.eps->image.tween)
- {
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio), TRUE);
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageNormalRadio), FALSE);
- etk_widget_show(UI_ImageTweenList);
- etk_widget_show(UI_MoveUpTweenButton);
- etk_widget_show(UI_MoveDownTweenButton);
- etk_widget_show(UI_DeleteTweenButton);
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_ImageComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ImageComboBox),0));
- }else{
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio), FALSE);
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageNormalRadio), TRUE);
- etk_widget_hide(UI_ImageTweenList);
- etk_widget_hide(UI_MoveUpTweenButton);
- etk_widget_hide(UI_MoveDownTweenButton);
- etk_widget_hide(UI_DeleteTweenButton);
- //Set the images combobox for normal image
- if (Cur.eps->image.normal)
- {
- i=0;
- //Loop for all the item in the Combobox
- while ((item = etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ImageComboBox),i)))
- {
- if ((image = etk_combobox_item_data_get(item)))
- {
- //Get the data for the item (should be an char* with the name of the image file)
- if (image == Cur.eps->image.normal)
- {
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_ImageComboBox),item); //If we found the item set active
- break;
- }
- }
- i++;
- }
- }else{
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_ImageComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ImageComboBox),0));
- }
- }
-
- etk_range_value_set (ETK_RANGE(UI_BorderTopSpinner), Cur.eps->image.border.t);
- etk_range_value_set (ETK_RANGE(UI_BorderLeftSpinner), Cur.eps->image.border.l);
- etk_range_value_set (ETK_RANGE(UI_BorderRightSpinner), Cur.eps->image.border.r);
- etk_range_value_set (ETK_RANGE(UI_BorderBottomSpinner), Cur.eps->image.border.b);
- etk_range_value_set (ETK_RANGE(UI_ImageAlphaSlider), Cur.eps->color.a);
-#endif
//ReEnable Signal Propagation
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderLeftSpinner), on_BorderSpinner_value_changed, (void*)BORDER_LEFT);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderRightSpinner), on_BorderSpinner_value_changed, (void*)BORDER_RIGHT);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderTopSpinner), on_BorderSpinner_value_changed, (void*)BORDER_TOP);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderBottomSpinner), on_BorderSpinner_value_changed, (void*)BORDER_BOTTOM);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_ImageAlphaSlider), on_ImageAlphaSlider_value_changed, NULL);
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_changed), NULL);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_ImageComboBox), ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
}
-#if TEST_DIRECT_EDJE
+
void
UpdateTextFrame(void)
{
int eff_num = 0;
- int i;
- double h, v;
//int alpha;
int r, g, b;
Etk_Combobox_Item *item = NULL;
char *combo_data;
- char *t;
- char *font;
+ const char *t;
+ const char *font;
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
@@ -927,7 +613,7 @@
//Stop signal propagation
etk_signal_block("text-changed",ETK_OBJECT(UI_TextEntry),on_TextEntry_text_changed, NULL);
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_changed), NULL);
+ etk_signal_block("item-activated", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignHSpinner), ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignVSpinner), ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
@@ -939,15 +625,15 @@
edje_edit_string_free(t);
//Set the font size spinner
- etk_range_value_set (ETK_RANGE(UI_FontSizeSpinner),
+ etk_range_value_set(ETK_RANGE(UI_FontSizeSpinner),
(float)edje_edit_state_text_size_get(edje_o, Cur.part->string, Cur.state->string));
//Set the font align spinners
- etk_range_value_set (ETK_RANGE(UI_FontAlignHSpinner),
+ etk_range_value_set(ETK_RANGE(UI_FontAlignHSpinner),
edje_edit_state_text_align_x_get(edje_o,
Cur.part->string,
Cur.state->string));
- etk_range_value_set (ETK_RANGE(UI_FontAlignVSpinner),
+ etk_range_value_set(ETK_RANGE(UI_FontAlignVSpinner),
edje_edit_state_text_align_y_get(edje_o,
Cur.part->string,
Cur.state->string));
@@ -965,7 +651,7 @@
if (combo_data && (strcmp(combo_data, font) == 0))
{
//If we found the item set active and break
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_FontComboBox),item);
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_FontComboBox),item);
break;
}
item = etk_combobox_item_next_get(item);
@@ -993,8 +679,8 @@
case ENGRAVE_TEXT_EFFECT_GLOW: eff_num = 9; break;
default: break; // remove warning
}
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_EffectComboBox),
- etk_combobox_nth_item_get (ETK_COMBOBOX(UI_EffectComboBox), eff_num));
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_EffectComboBox),
+ etk_combobox_nth_item_get(ETK_COMBOBOX(UI_EffectComboBox), eff_num));
//Set Text color Rects
edje_edit_state_color_get(edje_o, Cur.part->string, Cur.state->string,&r,&g,&b,NULL);
@@ -1006,91 +692,10 @@
//Renable signal propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_TextEntry), ETK_CALLBACK(on_TextEntry_text_changed), NULL);
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_changed), NULL);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignHSpinner), ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignVSpinner), ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
}
-#else
-void
-UpdateTextFrame(void)
-{
- int eff_num = 0;
- int i;
- double h, v;
- //int alpha;
- int r, g, b;
- Etk_Combobox_Item *item = NULL;
- Engrave_Font *ef;
-
- if (Cur.eps){
- printf("Update Text Frame: %s\n",Cur.eps->name);
-
- //Stop signal propagation
- etk_signal_block("text-changed",ETK_OBJECT(UI_TextEntry),on_TextEntry_text_changed, NULL);
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_changed), NULL);
-
- //Set Text Text in Cur.eps
- etk_entry_text_set(ETK_ENTRY(UI_TextEntry),
- engrave_part_state_text_text_get(Cur.eps));
-
-
- //Set the font combobox
- if (Cur.eps->text.font){//selected_desc->text_font->len > 0){
- i=0;
- //Loop for all the item in the Combobox
- while ((item = etk_combobox_nth_item_get(ETK_COMBOBOX(UI_FontComboBox),i))){
- //Get the data for the item (should be an Engrave_font*)
- if ((ef = etk_combobox_item_data_get(item))){
- printf("ITEM: %s - %s\n",engrave_font_name_get(ef),engrave_part_state_text_font_get(Cur.eps));
- if (strcmp(engrave_font_name_get(ef), Cur.eps->text.font) == 0)
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_FontComboBox),item); //If we found the item set active
- }
- i++;
- }
- }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_FontComboBox), etk_combobox_nth_item_get(ETK_COMBOBOX(UI_FontComboBox),0));}
-
- //Set the font size spinner
- etk_range_value_set (ETK_RANGE(UI_FontSizeSpinner),
- (float)engrave_part_state_text_size_get(Cur.eps));
-
- //Set the font align spinners
- engrave_part_state_text_align_get(Cur.eps, &h, &v);
- etk_range_value_set (ETK_RANGE(UI_FontAlignHSpinner), h);
- etk_range_value_set (ETK_RANGE(UI_FontAlignVSpinner), v);
-
- //Set Effect ComboBox
- switch (Cur.ep->effect)
- {
- case ENGRAVE_TEXT_EFFECT_NONE: eff_num = 0; break;
- case ENGRAVE_TEXT_EFFECT_PLAIN: eff_num = 0; break;
- case ENGRAVE_TEXT_EFFECT_OUTLINE: eff_num = 1; break;
- case ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE: eff_num = 2; break;
- case ENGRAVE_TEXT_EFFECT_SHADOW: eff_num = 3; break;
- case ENGRAVE_TEXT_EFFECT_SOFT_SHADOW: eff_num = 4; break;
- case ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW: eff_num = 5; break;
- case ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: eff_num = 6; break;
- case ENGRAVE_TEXT_EFFECT_FAR_SHADOW: eff_num = 7; break;
- case ENGRAVE_TEXT_EFFECT_FAR_SOFT_SHADOW: eff_num = 8; break;
- case ENGRAVE_TEXT_EFFECT_GLOW: eff_num = 9; break;
- default: break; // remove warning
- }
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_EffectComboBox),
- etk_combobox_nth_item_get (ETK_COMBOBOX(UI_EffectComboBox), eff_num));
-
- //Set Text color Rects
- engrave_part_state_color_get(Cur.eps,&r,&g,&b,NULL);
- evas_object_color_set(TextColorObject, r, g, b, 255);
- engrave_part_state_color2_get(Cur.eps,&r,&g,&b,NULL);
- evas_object_color_set(ShadowColorObject, r, g, b, 255);
- engrave_part_state_color3_get(Cur.eps,&r,&g,&b,NULL);
- evas_object_color_set(OutlineColorObject, r, g, b, 255);
-
- //Renable signal propagation
- etk_signal_unblock("text-changed", ETK_OBJECT(UI_TextEntry), ETK_CALLBACK(on_TextEntry_text_changed), NULL);
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_FontComboBox), ETK_CALLBACK(on_FontComboBox_changed), NULL);
- }
-}
-#endif
void
UpdatePositionFrame(void)
@@ -1106,7 +711,6 @@
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 TEST_DIRECT_EDJE
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
//Set relative position spinners
@@ -1119,25 +723,15 @@
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),
+ 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),
+ 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),
+ 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),
+ etk_range_value_set(ETK_RANGE(UI_Rel2YOffsetSpinner),
edje_edit_state_rel2_offset_y_get(edje_o, Cur.part->string,Cur.state->string));
-#else
- //Set relative position spinners
- etk_range_value_set (ETK_RANGE(UI_Rel1XSpinner), Cur.eps->rel1.relative.x);
- etk_range_value_set (ETK_RANGE(UI_Rel1XOffsetSpinner), Cur.eps->rel1.offset.x);
- etk_range_value_set (ETK_RANGE(UI_Rel1YSpinner), Cur.eps->rel1.relative.y);
- etk_range_value_set (ETK_RANGE(UI_Rel1YOffsetSpinner), Cur.eps->rel1.offset.y);
- etk_range_value_set (ETK_RANGE(UI_Rel2XSpinner), Cur.eps->rel2.relative.x);
- etk_range_value_set (ETK_RANGE(UI_Rel2XOffsetSpinner), Cur.eps->rel2.offset.x);
- etk_range_value_set (ETK_RANGE(UI_Rel2YSpinner), Cur.eps->rel2.relative.y);
- etk_range_value_set (ETK_RANGE(UI_Rel2YOffsetSpinner), Cur.eps->rel2.offset.y);
-#endif
+
//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);
@@ -1154,7 +748,6 @@
{
int i=0;
Etk_Combobox_Item *item = NULL;
- Engrave_Part *part = NULL;
printf("SETTING COMBOS\n");
@@ -1167,10 +760,10 @@
ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2X_SPINNER);
etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL2Y_SPINNER);
-#if TEST_DIRECT_EDJE
+
if (!etk_string_length_get(Cur.part)) return;
if (!etk_string_length_get(Cur.state)) return;
- char *rel;
+ const char *rel;
char *p;
//If rel1_to_x is know set the combobox
@@ -1182,13 +775,13 @@
{
p = etk_combobox_item_field_get(item, 1);
if (strcmp(p,rel) == 0)
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToXComboBox),item);
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel1ToXComboBox),item);
i++;
}
edje_edit_string_free(rel);
}
else
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToXComboBox),
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel1ToXComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToXComboBox),0));
//If rel1_to_y is know set the combobox
@@ -1200,13 +793,13 @@
{
p = etk_combobox_item_field_get(item, 1);
if (strcmp(p,rel) == 0)
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToYComboBox),item);
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel1ToYComboBox),item);
i++;
}
edje_edit_string_free(rel);
}
else
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToYComboBox),
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel1ToYComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToYComboBox),0));
//If rel2_to_x is know set the combobox
@@ -1218,13 +811,13 @@
{
p = etk_combobox_item_field_get(item, 1);
if (strcmp(p,rel) == 0)
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToXComboBox),item);
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel2ToXComboBox),item);
i++;
}
edje_edit_string_free(rel);
}
else
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToXComboBox),
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel2ToXComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToXComboBox),0));
//If rel2_to_y is know set the combobox
@@ -1236,96 +829,15 @@
{
p = etk_combobox_item_field_get(item, 1);
if (strcmp(p,rel) == 0)
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToYComboBox),item);
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel2ToYComboBox),item);
i++;
}
edje_edit_string_free(rel);
}
else
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToYComboBox),
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_Rel2ToYComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToYComboBox),0));
-#else
- //If rel1_to_x is know set the combobox
- if (Cur.eps->rel1.to_x)
- {
- i=0;
- while ((item = etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToXComboBox),i)))
- {
- //Loop for all the item in the Combobox
- if ((part = etk_combobox_item_data_get(item)))
- {
- //Get the data for the item (should be an Engrave_Part*)
- if ((int)part != REL_COMBO_INTERFACE)
- if (strcmp(part->name,Cur.eps->rel1.to_x) == 0)
- //If we found the item set active
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToXComboBox),item);
- }
- i++;
- }
- }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToXComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToXComboBox),0));}
-
- //If rel1_to_y is know set the combobox
- if (Cur.eps->rel1.to_y)
- {
- i=0;
- while ((item = etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToYComboBox),i)))
- {
- //Loop for all the item in the Combobox
- if ((part = etk_combobox_item_data_get(item)))
- {
- //Get the data for the item (should be an Engrave_part*)
- if ((int)part != REL_COMBO_INTERFACE)
- if (strcmp(part->name,Cur.eps->rel1.to_y) == 0)
- //If we found the item set active
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToYComboBox),item);
- }
- i++;
- }
- }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel1ToYComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel1ToYComboBox),0));}
-
- //If rel2_to_x is know set the combobox
- if (Cur.eps->rel2.to_x)
- {
- i=0;
- while ((item = etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToXComboBox),i)))
- {
- //Loop for all the item in the Combobox
- if ((part = etk_combobox_item_data_get(item)))
- {
- //Get the data for the item (should be an Engrave_part*)
- if ((int)part != REL_COMBO_INTERFACE)
- if (strcmp(part->name,Cur.eps->rel2.to_x) == 0)
- //If we found the item set active
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToXComboBox),item);
- }
- i++;
- }
- }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToXComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToXComboBox),0));}
-
- //If rel2_to_y is know set the combobox
- if (Cur.eps->rel2.to_y)
- {
- i=0;
- while ((item = etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToYComboBox),i)))
- {
- //Loop for all the item in the Combobox
- if ((part = etk_combobox_item_data_get(item)))
- {
- //Get the data for the item (should be an Engrave_part*)
- if ((int)part != REL_COMBO_INTERFACE)
- if (strcmp(part->name,Cur.eps->rel2.to_y) == 0)
- //If we found the item set active
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToYComboBox),item);
- }
- i++;
- }
- }else{etk_combobox_active_item_set (ETK_COMBOBOX(UI_Rel2ToYComboBox),
- etk_combobox_nth_item_get(ETK_COMBOBOX(UI_Rel2ToYComboBox),0));}
-#endif
//Reenable signal propagation
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void*)REL1X_SPINNER);
@@ -1368,8 +880,7 @@
etk_signal_block("text-changed", ETK_OBJECT(UI_Param2Entry),
ETK_CALLBACK(on_Param2Entry_text_changed), NULL);
-#if TEST_DIRECT_EDJE
- char *s;
+ const char *s;
if (!etk_string_length_get(Cur.prog)) return; //TODO place before signal_blocks
//Update Program
@@ -1394,13 +905,13 @@
//Update Action
/* if (Cur.epr->action == ENGRAVE_ACTION_SIGNAL_EMIT)
- etk_combobox_active_item_set (ETK_COMBOBOX(UI_ActionComboBox),
+ 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_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_active_item_set(ETK_COMBOBOX(UI_ActionComboBox),
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ActionComboBox),1));
//Update Target(s)
@@ -1412,28 +923,28 @@
str = etk_string_append(str,", ");
}
if (str->length > 2)
- etk_string_truncate (str, str->length - 2);
+ 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);
+ 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_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_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_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_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);
+ etk_range_value_set(ETK_RANGE(UI_DurationSpinner), Cur.epr->duration);
//Update Afters(s)
etk_string_truncate(str,0);
@@ -1446,81 +957,7 @@
etk_string_truncate (str, str->length - 2);
etk_entry_text_set(ETK_ENTRY(UI_AfterEntry),str->string);
etk_object_destroy(ETK_OBJECT(str));*/
-#else
-
- if (!Cur.epr) return;
-
- //printf("Update Program: %s\n",Cur.epr->name);
-
- //Update Program
- etk_entry_text_set(ETK_ENTRY(UI_ProgramEntry),Cur.epr->name);
-
- //Update Source
- etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),
- Cur.epr->source);
-
- //Update Signal
- etk_entry_text_set(ETK_ENTRY(UI_SignalEntry),Cur.epr->signal);
-
- //Update Delay
- etk_range_value_set (ETK_RANGE(UI_DelayFromSpinner), Cur.epr->in.from);
- etk_range_value_set (ETK_RANGE(UI_DelayRangeSpinner), Cur.epr->in.range);
-
- //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));
-
- //Update Target(s)
- Evas_List *tl; //target list
- Etk_String *str=etk_string_new("");
- for (tl = Cur.epr->targets; tl; tl = tl->next)
- {
- str = etk_string_append(str,tl->data);
- str = etk_string_append(str,", ");
- }
- if (str->length > 2)
- 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_append(str,tl->data);
- str = etk_string_append(str,", ");
- }
- if (str->length > 2)
- etk_string_truncate (str, str->length - 2);
- etk_entry_text_set(ETK_ENTRY(UI_AfterEntry),str->string);
- etk_object_destroy(ETK_OBJECT(str));
-#endif
//Reenable signal propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_ProgramEntry),
ETK_CALLBACK(on_ProgramEntry_text_changed), NULL);
@@ -1552,70 +989,21 @@
void
UpdateScriptFrame(void)
{
-#if TEST_DIRECT_EDJE
if (etk_string_length_get(Cur.group))
{
edje_edit_script_get(edje_o);
//printf("Update group script: %s\n",edje_edit_script_get(edje_o));
}
-#else
- //Update ScriptBox
- if (Cur.epr){
- printf("Update prog script: %s\n",Cur.epr->script);
- etk_textblock_text_set(ETK_TEXT_VIEW(UI_ScriptBox)->textblock,
- engrave_program_script_get(Cur.epr), ETK_FALSE);
- return;
- }
- if (Cur.eg){
- printf("Update group script: %s\n",Cur.eg->script);
- etk_textblock_text_set (ETK_TEXT_VIEW(UI_ScriptBox)->textblock,
- engrave_group_script_get(Cur.eg), ETK_FALSE);
- return;
- }
- etk_textblock_clear(ETK_TEXT_VIEW(UI_ScriptBox)->textblock);
-#endif
}
-void
-ShowFilechooser(int FileChooserType)
-{
- etk_widget_show_all(UI_FileChooserDialog);
-
- FileChooserOperation = FileChooserType;
- switch(FileChooserType){
- case FILECHOOSER_OPEN:
- etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an EDJ or EDC file to open");
- etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_FALSE);
- etk_widget_hide(UI_FilechooserSaveButton);
- break;
- case FILECHOOSER_IMAGE:
- etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an image to import");
- etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_FALSE);
- etk_widget_hide(UI_FilechooserSaveButton);
- break;
- case FILECHOOSER_FONT:
- etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an font to import");
- etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_FALSE);
- etk_widget_hide(UI_FilechooserSaveButton);
- break;
- case FILECHOOSER_SAVE_EDJ:
- etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the new edje name");
- etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_TRUE);
- etk_widget_hide(UI_FilechooserLoadButton);
- break;
- case FILECHOOSER_SAVE_EDC:
- etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the new edc name");
- etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(UI_FileChooser),ETK_TRUE);
- etk_widget_hide(UI_FilechooserLoadButton);
- break;
- default:
- break;
- }
-}
-/* functions to create interface*/
-Etk_Widget*
+/***********************************
+ *
+ * functions to create interface
+ *
+ ***********************************/
+static Etk_Widget*
create_filechooser_dialog(void)
{
//Dialog
@@ -1640,7 +1028,7 @@
return UI_FileChooserDialog;
}
-Etk_Widget*
+static Etk_Widget*
create_a_color_button(char* label_text, int color_button_enum,int w,int h)
{
Etk_Widget *vbox;
@@ -1660,7 +1048,7 @@
etk_box_append(ETK_BOX(vbox), shadow, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//ColorCanvas
- ColorCanvas = etk_canvas_new ();
+ ColorCanvas = etk_canvas_new();
//etk_box_append(ETK_BOX(vbox), ColorCanvas, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_container_add(ETK_CONTAINER(shadow), ColorCanvas);
etk_signal_connect("realized", ETK_OBJECT(ColorCanvas), ETK_CALLBACK(on_ColorCanvas_realize), (void*)color_button_enum);
@@ -1669,45 +1057,13 @@
//Label
if (label_text){
label = etk_label_new(label_text);
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
}
return vbox;
}
-/*Etk_Widget*
-create_toolbar_(Etk_Toolbar_Orientation o)
-{
- Etk_Widget *button;
-
- //hbox
- UI_Toolbar = etk_hbox_new(ETK_FALSE, 0);
-
- //NewButton
- button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_NEW);
- //button = etk_tool_button_new_with_label("asdas");
- etk_object_properties_set(button,"style",ETK_BUTTON_BOTH_HORIZ);
- // etk_object_properties_set(button,"label","New");
- // etk_object_properties_set(button,"stock_size",ETK_STOCK_BIG);
- //etk_toolbar_append(ETK_TOOLBAR(ToolBar), button, ETK_BOX_START);
- etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_NEW);
- etk_box_append(ETK_BOX(UI_Toolbar),button, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- //OpenButton
- button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
- etk_object_properties_set(button,"style",ETK_BUTTON_BOTH_VERT);
- etk_object_properties_set(button,"label","New");
- etk_object_properties_set(button,"stock_size",ETK_STOCK_BIG);
- //etk_toolbar_append(ETK_TOOLBAR(ToolBar), button, ETK_BOX_START);
- etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_OPEN);
- etk_box_append(ETK_BOX(UI_Toolbar),button, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- return UI_Toolbar;
-}*/
-
-Etk_Widget*
+static Etk_Widget*
create_toolbar(Etk_Toolbar_Orientation o)
{
Etk_Widget *button;
@@ -1716,8 +1072,8 @@
Etk_Widget *image;
//ToolBar
- UI_Toolbar = etk_toolbar_new ();
- etk_toolbar_orientation_set (ETK_TOOLBAR(UI_Toolbar), o);
+ UI_Toolbar = etk_toolbar_new();
+ etk_toolbar_orientation_set(ETK_TOOLBAR(UI_Toolbar), o);
//etk_object_properties_set(ETK_OBJECT(UI_Toolbar),"theme-group","etk/iconbox/label");
//etk_theme_edje_object_set(Evas_Object *object, const char *file, const char *group, const char *parent_group)
@@ -1928,24 +1284,10 @@
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_DEBUG);
etk_object_properties_set(ETK_OBJECT(button),"label","Debug",NULL);
-#if TEST_DIRECT_EDJE
-
-#else
- sep = etk_vseparator_new();
- etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), sep, ETK_BOX_START);
-
- //Test Button
- button = etk_tool_button_new_from_stock( ETK_STOCK_MEDIA_PLAYBACK_START);
- etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_PLAY);
- etk_object_properties_set(ETK_OBJECT(button),"label","Test group",NULL);
- etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
-#endif
-
return UI_Toolbar;
}
-Etk_Widget*
+static Etk_Widget*
create_group_frame(void)
{
Etk_Widget *label;
@@ -1976,34 +1318,34 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_GroupMinWSpinner
- UI_GroupMinWSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_GroupMinWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMinWSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_GroupMinWSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("x");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_GroupMinHSpinner
- UI_GroupMinHSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_GroupMinHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMinHSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_GroupMinHSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("max");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//UI_GroupMaxWSpinner
- UI_GroupMaxWSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_GroupMaxWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMaxWSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_GroupMaxWSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("x");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_GroupMaxHspinner
- UI_GroupMaxHSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_GroupMaxHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMaxHSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_GroupMaxHSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2025,51 +1367,49 @@
return vbox;
}
-Etk_Widget*
+static Etk_Widget*
create_tree(void)
{
-#if TEST_DIRECT_EDJE
//UI_GroupsComboBox
UI_GroupsComboBox = etk_combobox_new();
etk_combobox_column_add(ETK_COMBOBOX(UI_GroupsComboBox), ETK_COMBOBOX_LABEL, 30, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_GroupsComboBox));
- //etk_combobox_items_height_set (ETK_COMBOBOX(UI_GroupsComboBox), 18);
+ //etk_combobox_items_height_set(ETK_COMBOBOX(UI_GroupsComboBox), 18);
etk_signal_connect("item-activated", ETK_OBJECT(UI_GroupsComboBox),
ETK_CALLBACK(on_GroupsComboBox_activated), NULL);
-#endif
//UI_PartsTree
Etk_Tree_Col *col;
UI_PartsTree = etk_tree_new();
etk_widget_padding_set(UI_PartsTree,2,2,2,2);
- etk_tree_mode_set (ETK_TREE(UI_PartsTree), ETK_TREE_MODE_TREE);
- etk_tree_headers_visible_set (ETK_TREE(UI_PartsTree), ETK_FALSE);
+ etk_tree_mode_set(ETK_TREE(UI_PartsTree), ETK_TREE_MODE_TREE);
+ etk_tree_headers_visible_set(ETK_TREE(UI_PartsTree), ETK_FALSE);
etk_widget_size_request_set(UI_PartsTree, 260, 300);
//Main column
col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "File contents",100,0);
etk_tree_col_model_add(col,etk_tree_model_image_new());
etk_tree_col_model_add(col,etk_tree_model_text_new());
- etk_tree_col_resizable_set (col, ETK_FALSE);
- etk_tree_col_expand_set (col,ETK_TRUE);
+ etk_tree_col_resizable_set(col, ETK_FALSE);
+ etk_tree_col_expand_set(col,ETK_TRUE);
//Visibility column
col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "vis", 10,0);
- etk_tree_col_visible_set (col, DEBUG_TREE);
+ etk_tree_col_visible_set(col, DEBUG_TREE);
etk_tree_col_model_add(col,etk_tree_model_checkbox_new());
- etk_tree_col_resizable_set (col, ETK_FALSE);
- etk_tree_col_expand_set (col,ETK_FALSE);
+ etk_tree_col_resizable_set(col, ETK_FALSE);
+ etk_tree_col_expand_set(col,ETK_FALSE);
//RowType column
col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "type",10, 0);
etk_tree_col_model_add(col,etk_tree_model_int_new());
- etk_tree_col_visible_set (col, DEBUG_TREE);
- etk_tree_col_resizable_set (col, ETK_FALSE);
- etk_tree_col_expand_set (col,ETK_FALSE);
+ etk_tree_col_visible_set(col, DEBUG_TREE);
+ etk_tree_col_resizable_set(col, ETK_FALSE);
+ etk_tree_col_expand_set(col,ETK_FALSE);
//Parent part row
col = etk_tree_col_new(ETK_TREE(UI_PartsTree), "parent",100, 0);
etk_tree_col_model_add(col,etk_tree_model_text_new());
- etk_tree_col_visible_set (col, DEBUG_TREE);
- etk_tree_col_resizable_set (col, ETK_FALSE);
- etk_tree_col_expand_set (col,ETK_FALSE);
+ etk_tree_col_visible_set(col, DEBUG_TREE);
+ etk_tree_col_resizable_set(col, ETK_FALSE);
+ etk_tree_col_expand_set(col,ETK_FALSE);
etk_tree_build(ETK_TREE(UI_PartsTree));
etk_signal_connect("row-selected", ETK_OBJECT(UI_PartsTree),
@@ -2078,15 +1418,13 @@
//vbox
Etk_Widget *vbox;
vbox = etk_vbox_new(ETK_FALSE, 0);
-#if TEST_DIRECT_EDJE
etk_box_append(ETK_BOX(vbox), UI_GroupsComboBox, ETK_BOX_START, ETK_BOX_NONE, 0);
-#endif
etk_box_append(ETK_BOX(vbox), UI_PartsTree, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
return vbox;
}
-Etk_Widget*
+static Etk_Widget*
create_description_frame(void)
{
Etk_Widget *vbox;
@@ -2108,13 +1446,13 @@
//StateEntry
UI_StateEntry = etk_entry_new();
etk_box_append(ETK_BOX(hbox), UI_StateEntry, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
-#if !TEST_DIRECT_EDJE
+
//UI_StateIndexSpinner
- UI_StateIndexSpinner = etk_spinner_new (0.0, 1.0, 0.0, 0.1, 1.0);
- etk_spinner_digits_set (ETK_SPINNER(UI_StateIndexSpinner), 1);
+ UI_StateIndexSpinner = etk_spinner_new(0.0, 1.0, 0.0, 0.1, 1.0);
+ etk_spinner_digits_set(ETK_SPINNER(UI_StateIndexSpinner), 1);
etk_widget_size_request_set(UI_StateIndexSpinner,45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateIndexSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
-#endif
+
//hbox
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -2123,22 +1461,22 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
label = etk_label_new("min:");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_AspectMinSpinner
- UI_AspectMinSpinner = etk_spinner_new (0.0, 100.0, 0.0, 0.1, 1.0);
- etk_spinner_digits_set (ETK_SPINNER(UI_AspectMinSpinner), 1);
+ UI_AspectMinSpinner = etk_spinner_new(0.0, 100.0, 0.0, 0.1, 1.0);
+ etk_spinner_digits_set(ETK_SPINNER(UI_AspectMinSpinner), 1);
etk_widget_size_request_set(UI_AspectMinSpinner,45, 20);
etk_box_append(ETK_BOX(hbox),UI_AspectMinSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("max:");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_AspectMaxSpinner
- UI_AspectMaxSpinner = etk_spinner_new (0.0, 100.0, 0.0, 0.1, 1.0);
- etk_spinner_digits_set (ETK_SPINNER(UI_AspectMaxSpinner), 1);
+ UI_AspectMaxSpinner = etk_spinner_new(0.0, 100.0, 0.0, 0.1, 1.0);
+ etk_spinner_digits_set(ETK_SPINNER(UI_AspectMaxSpinner), 1);
etk_widget_size_request_set(UI_AspectMaxSpinner,45, 20);
etk_box_append(ETK_BOX(hbox),UI_AspectMaxSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2149,16 +1487,16 @@
etk_box_append(ETK_BOX(hbox),UI_AspectComboBox, ETK_BOX_START, ETK_BOX_NONE, 0);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox), "None");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_NONE);
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_NONE);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox), "Vertical");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_VERTICAL);
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_VERTICAL);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox), "Horizontal");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_HORIZONTAL);
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_HORIZONTAL);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox), "Both");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_BOTH);
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_ASPECT_PREFERENCE_BOTH);
//hbox
hbox = etk_hbox_new(ETK_FALSE, 0);
@@ -2168,34 +1506,34 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_StateMinWSpinner
- UI_StateMinWSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_StateMinWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMinWSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateMinWSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("x");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_StateMinHSpinner
- UI_StateMinHSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_StateMinHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMinHSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateMinHSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("max");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//UI_StateMaxWSpinner
- UI_StateMaxWSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_StateMaxWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMaxWSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateMaxWSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("x");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_StateMaxHspinner
- UI_StateMaxHSpinner = etk_spinner_new (0, 2000, 0, 1, 10);
+ UI_StateMaxHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMaxHSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateMaxHSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2207,8 +1545,8 @@
label = etk_label_new("Align");
etk_box_append(ETK_BOX(hbox),label, ETK_BOX_START, ETK_BOX_NONE, 0);
- UI_StateAlignHSpinner = etk_spinner_new (0, 1, 0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_StateAlignHSpinner), 2);
+ UI_StateAlignHSpinner = etk_spinner_new(0, 1, 0, 0.01, 0.1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_StateAlignHSpinner), 2);
etk_widget_size_request_set(UI_StateAlignHSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateAlignHSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2216,8 +1554,8 @@
label = etk_label_new("V Align");
etk_box_append(ETK_BOX(hbox),label, ETK_BOX_START, ETK_BOX_NONE, 0);
- UI_StateAlignVSpinner = etk_spinner_new (0, 1, 0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_StateAlignVSpinner), 2);
+ UI_StateAlignVSpinner = etk_spinner_new(0, 1, 0, 0.01, 0.1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_StateAlignVSpinner), 2);
etk_widget_size_request_set(UI_StateAlignVSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateAlignVSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2246,13 +1584,13 @@
return vbox;
}
-Etk_Widget*
+static Etk_Widget*
create_rectangle_frame(void)
{
return create_a_color_button("Color",COLOR_OBJECT_RECT,100,30);
}
-Etk_Widget*
+static Etk_Widget*
create_image_frame(void)
{
Etk_Widget *label;
@@ -2260,16 +1598,8 @@
Etk_Tree_Col *col1;
//table
- table = etk_table_new (5, 8, ETK_TABLE_NOT_HOMOGENEOUS);
-#if TEST_DIRECT_EDJE
-#else
- //ImageTweenRadio
- UI_ImageNormalRadio = etk_radio_button_new_with_label("Normal",NULL);
- UI_ImageTweenRadio = etk_radio_button_new_with_label_from_widget("Tween",
- ETK_RADIO_BUTTON(UI_ImageNormalRadio));
- etk_table_attach_default (ETK_TABLE(table),UI_ImageNormalRadio, 1, 2, 0, 0);
- etk_table_attach_default (ETK_TABLE(table),UI_ImageTweenRadio, 3, 4, 0, 0);
-#endif
+ table = etk_table_new(5, 8, ETK_TABLE_NOT_HOMOGENEOUS);
+
//imageComboBox
UI_ImageComboBox = etk_combobox_new();
etk_combobox_column_add(ETK_COMBOBOX(UI_ImageComboBox),
@@ -2277,39 +1607,39 @@
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, 1, 1);
//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);
+ 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);
//ImageTweenVBox
UI_ImageTweenVBox = etk_vbox_new(ETK_TRUE, 2);
- etk_table_attach_default (ETK_TABLE(table),UI_ImageTweenVBox, 0, 0, 2, 2);
+ etk_table_attach_default(ETK_TABLE(table),UI_ImageTweenVBox, 0, 0, 2, 2);
//MoveUpTweenButton
- UI_MoveUpTweenButton = etk_button_new_from_stock (ETK_STOCK_GO_UP);
+ UI_MoveUpTweenButton = etk_button_new_from_stock(ETK_STOCK_GO_UP);
etk_button_style_set(ETK_BUTTON(UI_MoveUpTweenButton), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(UI_MoveUpTweenButton),
ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_UP);
- etk_box_append (ETK_BOX(UI_ImageTweenVBox), UI_MoveUpTweenButton,
+ etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_MoveUpTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//MoveDownTweenButton
- UI_MoveDownTweenButton = etk_button_new_from_stock (ETK_STOCK_GO_DOWN);
+ UI_MoveDownTweenButton = etk_button_new_from_stock(ETK_STOCK_GO_DOWN);
etk_button_style_set(ETK_BUTTON(UI_MoveDownTweenButton), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(UI_MoveDownTweenButton),
ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_TWEEN_DOWN);
- etk_box_append (ETK_BOX(UI_ImageTweenVBox), UI_MoveDownTweenButton,
+ 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);
+ 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_append(ETK_BOX(UI_ImageTweenVBox), UI_DeleteTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//ImageTweenList
@@ -2321,54 +1651,54 @@
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, 2, 2);
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, 3, 3);
//ImageAlphaSlider
- UI_ImageAlphaSlider = etk_hslider_new (0, 255, 15, 1,20);
- etk_table_attach_default (ETK_TABLE(table),UI_ImageAlphaSlider, 1, 4, 3, 3);
+ UI_ImageAlphaSlider = etk_hslider_new(0, 255, 15, 1,20);
+ etk_table_attach_default(ETK_TABLE(table),UI_ImageAlphaSlider, 1, 4, 3, 3);
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_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 1, 1, 4, 4);
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_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 2, 2, 4, 4);
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_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 3, 3, 4, 4);
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_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 4, 4, 4, 4);
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_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 5, 5);
//UI_BorderLeftSpinner
- UI_BorderLeftSpinner = etk_spinner_new (0, 500, 0, 1, 10);
+ 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, 5, 5);
//UI_BorderRightSpinner
- UI_BorderRightSpinner = etk_spinner_new (0, 500, 0, 1, 10);
+ 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, 5, 5);
//UI_BorderTopSpinner
- UI_BorderTopSpinner = etk_spinner_new (0, 500, 0, 1, 10);
+ 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, 5, 5);
//UI_BorderBottomSpinner
- UI_BorderBottomSpinner = etk_spinner_new (0, 500, 0, 1, 10);
+ 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, 5, 5);
etk_signal_connect("clicked", ETK_OBJECT(UI_ImageNormalRadio),
ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_NORMAL_RADIO);
@@ -2378,8 +1708,8 @@
ETK_CALLBACK(on_ImageTweenList_row_selected), NULL);
etk_signal_connect("clicked", ETK_OBJECT(UI_ImageAddButton),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_IMAGE_FILE_ADD);
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_ImageComboBox),
- ETK_CALLBACK(on_ImageComboBox_changed), NULL);
+ etk_signal_connect("item-activated", ETK_OBJECT(UI_ImageComboBox),
+ ETK_CALLBACK(on_ImageComboBox_item_activated), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_ImageAlphaSlider),
ETK_CALLBACK(on_ImageAlphaSlider_value_changed), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_BorderLeftSpinner),
@@ -2394,7 +1724,7 @@
return table;
}
-Etk_Widget*
+static Etk_Widget*
create_text_frame(void)
{
Etk_Widget *vbox;
@@ -2407,21 +1737,21 @@
vbox = etk_vbox_new(ETK_FALSE, 5);
//table
- table = etk_table_new (5, 4, ETK_TABLE_NOT_HOMOGENEOUS);
+ table = etk_table_new(5, 4, ETK_TABLE_NOT_HOMOGENEOUS);
etk_box_append(ETK_BOX(vbox), table, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
label = etk_label_new("Text");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default (ETK_TABLE(table),label, 0, 0, 0,0);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 0,0);
//Text Entry
UI_TextEntry = etk_entry_new ();
//etk_widget_size_request_set(UI_TextEntry,30, 30);
- etk_table_attach_default (ETK_TABLE(table),UI_TextEntry, 1, 4, 0,0);
+ etk_table_attach_default(ETK_TABLE(table),UI_TextEntry, 1, 4, 0,0);
label = etk_label_new("Font");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default (ETK_TABLE(table),label, 0, 0, 1,1);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 1,1);
//FontComboBox
UI_FontComboBox = etk_combobox_new();
@@ -2430,44 +1760,44 @@
etk_combobox_column_add(ETK_COMBOBOX(UI_FontComboBox),
ETK_COMBOBOX_LABEL, 75, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_FontComboBox));
- etk_table_attach_default (ETK_TABLE(table),UI_FontComboBox, 1, 1, 1,1);
+ etk_table_attach_default(ETK_TABLE(table),UI_FontComboBox, 1, 1, 1,1);
//FontAddButton
- UI_FontAddButton = etk_button_new_from_stock (ETK_STOCK_DOCUMENT_OPEN);
- etk_object_properties_set (ETK_OBJECT(UI_FontAddButton), "label","",NULL);
- etk_table_attach_default (ETK_TABLE(table),UI_FontAddButton, 2, 2, 1, 1);
+ UI_FontAddButton = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
+ etk_object_properties_set(ETK_OBJECT(UI_FontAddButton), "label","",NULL);
+ etk_table_attach_default(ETK_TABLE(table),UI_FontAddButton, 2, 2, 1, 1);
label = etk_label_new("Size");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
- etk_table_attach_default (ETK_TABLE(table),label, 3, 3, 1,1);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_table_attach_default(ETK_TABLE(table),label, 3, 3, 1,1);
//FontSizeSpinner
- UI_FontSizeSpinner = etk_spinner_new (0, 200, 0, 1, 10);
+ UI_FontSizeSpinner = etk_spinner_new(0, 200, 0, 1, 10);
etk_widget_size_request_set(UI_FontSizeSpinner, 45, 20);
- etk_table_attach_default (ETK_TABLE(table),UI_FontSizeSpinner, 4, 4, 1,1);
+ etk_table_attach_default(ETK_TABLE(table),UI_FontSizeSpinner, 4, 4, 1,1);
//FontAlignHSpinner
label = etk_label_new("Align");
- etk_table_attach_default (ETK_TABLE(table),label, 0, 0, 2,2);
+ etk_table_attach_default(ETK_TABLE(table),label,0,0, 2,2);
- UI_FontAlignHSpinner = etk_spinner_new (0, 1, 0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_FontAlignHSpinner), 2);
+ UI_FontAlignHSpinner = etk_spinner_new(0, 1, 0, 0.01, 0.1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_FontAlignHSpinner), 2);
etk_widget_size_request_set(UI_FontAlignHSpinner, 45, 20);
- etk_table_attach_default (ETK_TABLE(table),UI_FontAlignHSpinner, 1, 1, 2,2);
+ etk_table_attach_default(ETK_TABLE(table),UI_FontAlignHSpinner, 1, 1, 2,2);
//FontAlignVSpinner
label = etk_label_new("V Align");
- etk_table_attach_default (ETK_TABLE(table),label, 2, 2, 2,2);
+ etk_table_attach_default(ETK_TABLE(table),label, 2, 2, 2,2);
UI_FontAlignVSpinner = etk_spinner_new (0, 1, 0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_FontAlignVSpinner), 2);
+ etk_spinner_digits_set(ETK_SPINNER(UI_FontAlignVSpinner), 2);
etk_widget_size_request_set(UI_FontAlignVSpinner, 45, 20);
- etk_table_attach_default (ETK_TABLE(table),UI_FontAlignVSpinner, 3, 4, 2,2);
+ etk_table_attach_default(ETK_TABLE(table),UI_FontAlignVSpinner, 3, 4, 2,2);
//PartEffectComboBox
label = etk_label_new("Effect");
- etk_table_attach_default (ETK_TABLE(table),label, 0, 0, 3,3);
+ etk_table_attach_default(ETK_TABLE(table),label, 0, 0, 3,3);
UI_EffectComboBox = etk_combobox_new();
etk_combobox_column_add(ETK_COMBOBOX(UI_EffectComboBox),
@@ -2477,37 +1807,37 @@
etk_combobox_build(ETK_COMBOBOX(UI_EffectComboBox));
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Plain");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_PLAIN);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Plain");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_PLAIN);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Outline");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_OUTLINE);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Outline");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_OUTLINE);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Soft Outline");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Soft Outline");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Shadow");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_SHADOW);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Shadow");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Soft Shadow");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_SOFT_SHADOW);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Soft Shadow");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_SOFT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Outline Shadow");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Outline Shadow");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Outline Soft Shadow");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Outline Soft Shadow");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Far Shadow");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_FAR_SHADOW);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Far Shadow");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_FAR_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Far Soft Shadow");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_FAR_SOFT_SHADOW);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Far Soft Shadow");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_FAR_SOFT_SHADOW);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_EffectComboBox),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Glow");
- etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_GLOW);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Glow");
+ etk_combobox_item_data_set(ComboItem, (void*)ENGRAVE_TEXT_EFFECT_GLOW);
- etk_table_attach_default (ETK_TABLE(table),UI_EffectComboBox, 1, 4, 3,3);
+ etk_table_attach_default(ETK_TABLE(table),UI_EffectComboBox,1,4,3,3);
//hbox
hbox = etk_hbox_new(ETK_FALSE, 10);
@@ -2523,8 +1853,8 @@
etk_signal_connect("clicked", ETK_OBJECT(UI_FontAddButton),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_FONT_FILE_ADD);
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_FontComboBox),
- ETK_CALLBACK(on_FontComboBox_changed), NULL);
+ etk_signal_connect("item-activated", ETK_OBJECT(UI_FontComboBox),
+ ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_EffectComboBox),
ETK_CALLBACK(on_EffectComboBox_changed), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_FontSizeSpinner),
@@ -2539,7 +1869,7 @@
return vbox;
}
-Etk_Widget*
+static Etk_Widget*
create_position_frame(void)
{
Etk_Widget *vbox;
@@ -2547,19 +1877,19 @@
Etk_Widget *label;
/* //Position Notebook
- notebook = etk_notebook_new ();
+ notebook = etk_notebook_new();
etk_container_add(ETK_CONTAINER(UI_PositionFrame), notebook);
*/
/* //Simple TAB
vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_notebook_page_append (ETK_NOTEBOOK(notebook), "Simple", vbox);
+ etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Simple", vbox);
//hbox
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
label = etk_label_new("Container");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//SimpleParentCombobox
@@ -2571,10 +1901,10 @@
//ADVANCED TAB
//vbox
vbox = etk_vbox_new(ETK_FALSE, 0);
- // etk_notebook_page_append (ETK_NOTEBOOK(notebook), "Advanced", vbox);
+ // etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Advanced", vbox);
label = etk_label_new("<color=#FF0000><b>First_Point</b></>");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//hbox
@@ -2585,8 +1915,8 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel1XSpinner
- UI_Rel1XSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_Rel1XSpinner), 2);
+ UI_Rel1XSpinner = etk_spinner_new(-100.0, 100.0, 0.0, 0.01, 0.1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_Rel1XSpinner), 2);
etk_widget_size_request_set(UI_Rel1XSpinner,45, 20);
etk_box_append(ETK_BOX(hbox),UI_Rel1XSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2594,12 +1924,12 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//Rel1XOffsetEntry
- UI_Rel1XOffsetSpinner = etk_spinner_new (-2000, 2000, 0, 1, 10);
+ UI_Rel1XOffsetSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_Rel1XOffsetSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_Rel1XOffsetSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<color=#FF0000>to</>");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel1ToXCombobox
@@ -2619,8 +1949,8 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel1YSpinner
- UI_Rel1YSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_Rel1YSpinner), 2);
+ UI_Rel1YSpinner = etk_spinner_new(-100.0, 100.0, 0.0, 0.01, 0.1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_Rel1YSpinner), 2);
etk_widget_size_request_set(UI_Rel1YSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox), UI_Rel1YSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2628,12 +1958,12 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//Rel1YOffsetSpinner
- UI_Rel1YOffsetSpinner = etk_spinner_new (-2000, 2000, 0, 1, 10);
+ UI_Rel1YOffsetSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_Rel1YOffsetSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox), UI_Rel1YOffsetSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<color=#FF0000>to</> ");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel1ToYCombobox
@@ -2646,7 +1976,7 @@
etk_box_append(ETK_BOX(hbox), UI_Rel1ToYComboBox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
label = etk_label_new("<color=#0000FF><b>Second_Point</b></>");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",0.5,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",0.5,NULL);
etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//hbox
@@ -2657,8 +1987,8 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel2XSpinner
- UI_Rel2XSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_Rel2XSpinner), 2);
+ UI_Rel2XSpinner = etk_spinner_new(-100.0, 100.0, 0.0, 0.01, 0.1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_Rel2XSpinner), 2);
etk_widget_size_request_set(UI_Rel2XSpinner,45, 20);
etk_box_append(ETK_BOX(hbox), UI_Rel2XSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2666,12 +1996,12 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//Rel2XOffsetSpinner
- UI_Rel2XOffsetSpinner = etk_spinner_new (-2000, 2000, 0, 1, 10);
+ UI_Rel2XOffsetSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_Rel2XOffsetSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox), UI_Rel2XOffsetSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<color=#0000FF>to</>");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel2ToXCombobox
@@ -2691,8 +2021,8 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel2YSpinner
- UI_Rel2YSpinner = etk_spinner_new (-100.0, 100.0, 0.0, 0.01, 0.1);
- etk_spinner_digits_set (ETK_SPINNER(UI_Rel2YSpinner), 2);
+ UI_Rel2YSpinner = etk_spinner_new(-100.0, 100.0, 0.0, 0.01, 0.1);
+ etk_spinner_digits_set(ETK_SPINNER(UI_Rel2YSpinner), 2);
etk_widget_size_request_set(UI_Rel2YSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox), UI_Rel2YSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -2700,12 +2030,12 @@
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//Rel2YOffsetSpinner
- UI_Rel2YOffsetSpinner = etk_spinner_new (-2000, 2000, 0, 1, 10);
+ UI_Rel2YOffsetSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_Rel2YOffsetSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox), UI_Rel2YOffsetSpinner, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<color=#0000FF>to</> ");
- etk_object_properties_set (ETK_OBJECT(label), "xalign",1.0,NULL);
+ etk_object_properties_set(ETK_OBJECT(label), "xalign",1.0,NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Rel1ToYCombobox
@@ -2747,7 +2077,7 @@
return vbox;
}
-Etk_Widget*
+static Etk_Widget*
create_part_frame(void)
{
Etk_Widget *table;
@@ -2757,17 +2087,17 @@
Etk_Widget *hbox;
//table
- table = etk_table_new (2, 3, ETK_TABLE_NOT_HOMOGENEOUS);
+ table = etk_table_new(2, 3, ETK_TABLE_NOT_HOMOGENEOUS);
//PartNameEntry
label = etk_label_new("<b>Name</b>");
- etk_table_attach (ETK_TABLE(table), label, 0, 0, 0, 0,ETK_TABLE_NONE,0,0);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0,ETK_TABLE_NONE,0,0);
UI_PartNameEntry = etk_entry_new();
- etk_table_attach_default (ETK_TABLE(table),UI_PartNameEntry, 1, 1, 0, 0);
+ etk_table_attach_default(ETK_TABLE(table),UI_PartNameEntry, 1, 1, 0, 0);
//PartClipToComboBox
label = etk_label_new("<b>Clip_to</b>");
- etk_table_attach (ETK_TABLE(table), label, 0, 0, 1, 1,ETK_TABLE_NONE,0,0);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1,ETK_TABLE_NONE,0,0);
combo = etk_combobox_new();
etk_combobox_column_add(ETK_COMBOBOX(combo),
@@ -2776,8 +2106,8 @@
ETK_COMBOBOX_LABEL, 75, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(combo));
etk_combobox_item_append(ETK_COMBOBOX(combo),
- etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Not yet implemented");
- etk_table_attach_default (ETK_TABLE(table), combo, 1, 1, 1, 1);
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"), "Not yet implemented");
+ etk_table_attach_default(ETK_TABLE(table), combo, 1, 1, 1, 1);
//events frame
frame = etk_frame_new("Mouse events");
@@ -2789,12 +2119,12 @@
etk_container_add(ETK_CONTAINER(frame), hbox);
//PartEventsCheck
- UI_PartEventsCheck = etk_check_button_new_with_label ("Accept</b>");
+ UI_PartEventsCheck = etk_check_button_new_with_label("Accept</b>");
etk_box_append(ETK_BOX(hbox), UI_PartEventsCheck,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//PartEventRepeatCheck
- UI_PartEventsRepeatCheck = etk_check_button_new_with_label ("Repeat</b>");
+ UI_PartEventsRepeatCheck = etk_check_button_new_with_label("Repeat</b>");
etk_box_append(ETK_BOX(hbox), UI_PartEventsRepeatCheck,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
@@ -2809,21 +2139,21 @@
return table;
}
-Etk_Widget*
+static Etk_Widget*
create_program_frame(void)
{
Etk_Widget *table;
Etk_Widget *label;
//table
- table = etk_table_new (4, 10, ETK_TABLE_NOT_HOMOGENEOUS);
+ table = etk_table_new(4, 10, ETK_TABLE_NOT_HOMOGENEOUS);
//UI_ProgramEntry
label = etk_label_new("<b>Name</b>");
- etk_table_attach (ETK_TABLE(table), label, 0, 0, 0, 0,ETK_TABLE_NONE,0,0);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0,ETK_TABLE_NONE,0,0);
UI_ProgramEntry = etk_entry_new();
etk_tooltips_tip_set(UI_ProgramEntry, "Symbolic <b>name</b> of program as a unique identifier.");
- etk_table_attach_default (ETK_TABLE(table),UI_ProgramEntry, 1, 3, 0, 0);
+ etk_table_attach_default(ETK_TABLE(table),UI_ProgramEntry, 1, 3, 0, 0);
//UI_SourceEntry
label = etk_label_new("<b>Source</b>");
@@ -2839,40 +2169,40 @@
//UI_SignalEntry
label = etk_label_new("<b>Signal</b>");
- etk_table_attach (ETK_TABLE(table), label, 0, 0, 2, 2,ETK_TABLE_NONE,0,0);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 2, 2,ETK_TABLE_NONE,0,0);
UI_SignalEntry = etk_entry_new();
etk_tooltips_tip_set(UI_SignalEntry, "The name of the <b>signal</b> that will trigger the program.<br>Wildcards can be used to widen the scope, ex: \"mouse,down,*\"<br>Can be a mouse signal ( mouse,in ; mouse,up,1 )<br>Or a user defined signal (emitted by the application)");
- etk_table_attach_default (ETK_TABLE(table),UI_SignalEntry, 1, 3, 2, 2);
+ etk_table_attach_default(ETK_TABLE(table),UI_SignalEntry, 1, 3, 2, 2);
//UI_DelayFromSpinner
label = etk_label_new("<b>Delay</b>");
- 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_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), 1);
etk_widget_size_request_set(UI_DelayFromSpinner,45, 20);
- etk_table_attach_default (ETK_TABLE(table),UI_DelayFromSpinner, 1, 1, 3, 3);
+ etk_table_attach_default(ETK_TABLE(table),UI_DelayFromSpinner, 1, 1, 3, 3);
//UI_DelayRangeSpinner
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_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), 1);
etk_widget_size_request_set(UI_DelayRangeSpinner,45, 20);
- etk_table_attach_default (ETK_TABLE(table),UI_DelayRangeSpinner, 3, 3, 3, 3);
+ etk_table_attach_default(ETK_TABLE(table),UI_DelayRangeSpinner, 3, 3, 3, 3);
//UI_AfterEntry
label = etk_label_new("<b>After(s)</b>");
etk_table_attach (ETK_TABLE(table), label, 0, 0, 4, 4,ETK_TABLE_NONE,0,0);
UI_AfterEntry = etk_entry_new();
etk_tooltips_tip_set(UI_AfterEntry, "Specifies program(s) to run after the current program completes.<br>The <i>source</i> and <i>signal</i> parameters of a program run as an <i>after</j> are ignored.<br>Multiple programs can be specified separated by ',' (comma).");
- etk_table_attach_default (ETK_TABLE(table),UI_AfterEntry, 1, 3, 4, 4);
+ etk_table_attach_default(ETK_TABLE(table),UI_AfterEntry, 1, 3, 4, 4);
//UI_ActionComboBox
Etk_Combobox_Item *item = NULL;
label = etk_label_new("<b>Action</b>");
- etk_table_attach (ETK_TABLE(table), label, 0, 0, 5, 5,ETK_TABLE_NONE,0,0);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 5, 5, ETK_TABLE_NONE, 0, 0);
UI_ActionComboBox = etk_combobox_new();
//etk_tooltips_tip_set(UI_ActionComboBox, "<b>Action</b> to be performed by the program.<br>STATE_SET is used to change the state of one or more targets parts<br>, ACTION_STOP and SIGNAL_EMIT.<br>");
etk_combobox_column_add(ETK_COMBOBOX(UI_ActionComboBox),
@@ -2881,20 +2211,20 @@
ETK_COMBOBOX_LABEL, 75, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_ActionComboBox));
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_image_new_from_edje(EdjeFile,"DESC.PNG"), "State Set");
+ etk_combobox_item_data_set(item, ENGRAVE_ACTION_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_image_new_from_edje(EdjeFile,"DESC.PNG"), "Action Stop");
+ etk_combobox_item_data_set(ETK_COMBOBOX_ITEM(item), (void*)ENGRAVE_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);
+ 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);
//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);
+ etk_table_attach(ETK_TABLE(table),UI_TargetLabel,0,0,6,6,ETK_TABLE_NONE,0,0);
UI_TargetEntry = etk_entry_new();
etk_tooltips_tip_set(UI_TargetEntry, "Program or part on which the specified action acts.<br>Multiple target keywords may be specified, separated by ','(comma).");
etk_table_attach_default(ETK_TABLE(table), UI_TargetEntry, 1, 4, 6, 6);
@@ -2907,11 +2237,11 @@
etk_table_attach_default(ETK_TABLE(table), UI_Param1Entry, 1, 2, 7, 7);
//Param1Spinner
- UI_Param1Spinner = etk_spinner_new (0.0, 1.0, 0.0, 0.1, 1.0);
+ 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), 1);
etk_widget_size_request_set(UI_Param1Spinner,45, 20);
- etk_table_attach_default (ETK_TABLE(table),UI_Param1Spinner, 3, 3, 7, 7);
+ etk_table_attach_default(ETK_TABLE(table),UI_Param1Spinner, 3, 3, 7, 7);
//UI_TransiComboBox
@@ -2924,27 +2254,27 @@
ETK_COMBOBOX_LABEL, 75, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_TransiComboBox));
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_image_new_from_edje(EdjeFile,"DESC.PNG"), "Linear");
+ etk_combobox_item_data_set(item, ENGRAVE_TRANSITION_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_image_new_from_edje(EdjeFile,"DESC.PNG"), "Sinusoidal");
+ etk_combobox_item_data_set(item, (void*)ENGRAVE_TRANSITION_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_image_new_from_edje(EdjeFile,"DESC.PNG"), "Accelerate");
+ etk_combobox_item_data_set(item, (void*)ENGRAVE_TRANSITION_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_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);
//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);
+ 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), 1);
etk_widget_size_request_set(UI_DurationSpinner,45, 20);
- etk_table_attach_default (ETK_TABLE(table),UI_DurationSpinner, 3, 3, 8, 8);
+ etk_table_attach_default(ETK_TABLE(table),UI_DurationSpinner, 3, 3, 8, 8);
//UI_Param2Entry
UI_Param2Label = etk_label_new("<b>Source</b>");
@@ -2985,7 +2315,7 @@
return table;
}
-Etk_Widget*
+static Etk_Widget*
create_script_frame(void)
{
Etk_Widget *sv;
@@ -3015,17 +2345,26 @@
return vbox;
}
+static void
+_embed_position_set(void *position_data, int *x, int *y)
+{
+ ecore_evas_geometry_get(position_data, x, y, NULL, NULL);
+}
+
void
create_main_window(void)
{
-
//Create the main ecore_evas window
+#if USE_GL_ENGINE
+ UI_ecore_MainWin = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 32, 32);
+#else
UI_ecore_MainWin = ecore_evas_software_x11_new(NULL, 0, 0, 0, 32, 32);
+#endif
ecore_evas_title_set(UI_ecore_MainWin, "Edje Editor");
ecore_evas_callback_resize_set(UI_ecore_MainWin, ecore_resize_callback);
ecore_evas_callback_delete_request_set(UI_ecore_MainWin, ecore_delete_cb);
ecore_evas_resize(UI_ecore_MainWin, 950, 500);
- ecore_evas_size_min_set (UI_ecore_MainWin, 600, 350);
+ ecore_evas_size_min_set(UI_ecore_MainWin, 600, 350);
ecore_evas_show(UI_ecore_MainWin);
UI_evas = ecore_evas_get(UI_ecore_MainWin);
@@ -3036,7 +2375,7 @@
evas_object_show(edje_ui);
//Tooltips
- etk_tooltips_init ();
+ etk_tooltips_init();
etk_tooltips_enable();
//Create the evas objects needed by the canvas (fakewin, handlers)
@@ -3060,6 +2399,7 @@
etk_widget_show_all(UI_PartsTreeEmbed);
//Logo
+ Evas_Object *logo;
logo = edje_object_add(UI_evas);
edje_object_file_set(logo, EdjeFile, "Logo");
evas_object_show(logo);
@@ -3167,13 +2507,11 @@
etk_signal_connect("color-changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(on_ColorDialog_change), NULL);
-#if TEST_DIRECT_EDJE
//Create the main edje object to edit
edje_o = edje_object_add(UI_evas);
#if ECHO_EDJE_SIGNAL
edje_object_signal_callback_add(edje_o, "*", "*", signal_cb, NULL);
#endif
-#endif
/*edje_object_signal_emit(edje_ui,"group_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"part_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"description_frame_show","edje_editor");
@@ -3185,26 +2523,5 @@
edje_object_signal_emit(edje_ui,"script_frame_show","edje_editor");*/
}
-/* Called when the window is resized */
-void
-ecore_resize_callback(Ecore_Evas *ecore_evas)
-{
- Evas_Object *embed_object;
- int win_w, win_h;
-
- //Get window size
- ecore_evas_geometry_get(UI_ecore_MainWin, NULL, NULL, &win_w, &win_h);
-
- //Resize main edje interface
- evas_object_resize(edje_ui, win_w, win_h);
-
- //Resize tree
- embed_object = etk_embed_object_get(ETK_EMBED(UI_PartsTreeEmbed));
- evas_object_move(embed_object, 0, 55);
- evas_object_resize(embed_object, TREE_WIDTH, win_h - 55);
-}
-void _embed_position_set(void *position_data, int *x, int *y)
-{
- ecore_evas_geometry_get(position_data, x, y, NULL, NULL);
-}
+
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- interface.h 28 Dec 2007 23:01:41 -0000 1.24
+++ interface.h 15 Feb 2008 21:41:21 -0000 1.25
@@ -1,46 +1,84 @@
+#ifndef _EDJE_EDITOR_INTERFACE_H_
+#define _EDJE_EDITOR_INTERFACE_H_
+
#include "main.h"
+/* Etk_Tree Helper */
#define TREE_COL_NAME 0
#define TREE_COL_VIS 1
#define TREE_COL_TYPE 2
#define TREE_COL_PARENT 3
-
#define COL_NAME etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), TREE_COL_NAME)
#define COL_VIS etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), TREE_COL_VIS)
#define COL_TYPE etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), TREE_COL_TYPE)
#define COL_PARENT etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), TREE_COL_PARENT)
Evas *UI_evas;
+/* main window objects */
Ecore_Evas *UI_ecore_MainWin;
-//Etk_Widget *UI_MainWin;
+Etk_Widget *UI_GroupsComboBox;
Etk_Widget *UI_Toolbar;
Etk_Widget *UI_PartsTree;
-Etk_Widget *UI_GroupComboBox;
+Etk_Widget *UI_AddMenu;
+Etk_Widget *UI_RemoveMenu;
+Etk_Widget *UI_OptionsMenu;
+/* extra window objects */
Etk_Widget *UI_ColorPickerWin;
-Etk_Widget *UI_StateEntry;
-Etk_Widget *UI_GroupNameEntry;
-Etk_Widget *UI_StateIndexSpinner;
-Evas_Object *RectColorObject;
-Evas_Object *TextColorObject;
-Evas_Object *ShadowColorObject;
-Evas_Object *OutlineColorObject;
+Etk_Widget *UI_AlertDialog;
+Etk_Widget *UI_FileChooser;
+Etk_Widget *UI_FileChooserDialog;
+Etk_Widget *UI_FilechooserSaveButton;
+Etk_Widget *UI_FilechooserLoadButton;
Etk_Widget *UI_ColorWin;
Etk_Widget *UI_ColorPicker;
+/* group frame objects */
+Etk_Widget *UI_GroupNameEntry;
+Etk_Widget *UI_GroupMinWSpinner;
+Etk_Widget *UI_GroupMinHSpinner;
+Etk_Widget *UI_GroupMaxWSpinner;
+Etk_Widget *UI_GroupMaxHSpinner;
+Etk_Widget *UI_CurrentGroupSizeLabel;
+/* part frame objects */
+Etk_Widget *UI_PartNameEntry;
+Etk_Widget *UI_PartTypeComboBox;
+Etk_Widget *UI_PartEventsCheck;
+Etk_Widget *UI_PartEventsRepeatCheck;
+/* state frame objects */
+Etk_Widget *UI_StateEntry;
+Etk_Widget *UI_StateIndexSpinner;
+Etk_Widget *UI_StateMinWSpinner;
+Etk_Widget *UI_StateMinHSpinner;
+Etk_Widget *UI_StateMaxWSpinner;
+Etk_Widget *UI_StateMaxHSpinner;
+Etk_Widget *UI_StateAlignVSpinner;
+Etk_Widget *UI_StateAlignHSpinner;
+/* text frame objects */
Etk_Widget *UI_TextEntry;
Etk_Widget *UI_FontComboBox;
+Etk_Widget *UI_FontSizeSpinner;
+Etk_Widget *UI_EffectComboBox;
+Etk_Widget *UI_FontAddButton;
+Etk_Widget *UI_FontAlignVSpinner;
+Etk_Widget *UI_FontAlignHSpinner;
+Etk_Widget *UI_AspectMinSpinner;
+Etk_Widget *UI_AspectMaxSpinner;
+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_DeleteTweenButton;
Etk_Widget *UI_MoveDownTweenButton;
Etk_Widget *UI_MoveUpTweenButton;
-Etk_Widget *UI_FontSizeSpinner;
-Etk_Widget *UI_EffectComboBox;
-Etk_Widget *UI_PartNameEntry;
-Etk_Widget *UI_PartTypeComboBox;
-Etk_Widget *UI_ImageAlphaSlider;
+Etk_Widget *UI_BorderTopSpinner;
+Etk_Widget *UI_BorderLeftSpinner;
+Etk_Widget *UI_BorderBottomSpinner;
+Etk_Widget *UI_BorderRightSpinner;
+Etk_Widget *UI_ImageAddButton;
+/* position frame objects */
Etk_Widget *UI_Rel1XSpinner;
Etk_Widget *UI_Rel1XOffsetSpinner;
Etk_Widget *UI_Rel1YSpinner;
@@ -49,45 +87,16 @@
Etk_Widget *UI_Rel2XOffsetSpinner;
Etk_Widget *UI_Rel2YSpinner;
Etk_Widget *UI_Rel2YOffsetSpinner;
-Etk_Widget *UI_AddMenu;
-Etk_Widget *UI_RemoveMenu;
-Etk_Widget *UI_OptionsMenu;
Etk_Widget *UI_Rel1ToXComboBox;
Etk_Widget *UI_Rel1ToYComboBox;
Etk_Widget *UI_Rel2ToXComboBox;
Etk_Widget *UI_Rel2ToYComboBox;
-Etk_Widget *UI_BorderTopSpinner;
-Etk_Widget *UI_BorderLeftSpinner;
-Etk_Widget *UI_BorderBottomSpinner;
-Etk_Widget *UI_BorderRightSpinner;
-Etk_Widget *UI_FileChooser;
-Etk_Widget *UI_FileChooserDialog;
-Etk_Widget *UI_PlayTextView;
-Etk_Widget *UI_FilechooserSaveButton;
-Etk_Widget *UI_FilechooserLoadButton;
-Etk_Widget *UI_tree_vbox;
-Etk_Widget *UI_AlertDialog;
-Etk_Widget *UI_GroupMinWSpinner;
-Etk_Widget *UI_GroupMinHSpinner;
-Etk_Widget *UI_GroupMaxWSpinner;
-Etk_Widget *UI_GroupMaxHSpinner;
-Etk_Widget *UI_ImageAddButton;
-Etk_Widget *UI_FontAddButton;
-Etk_Widget *UI_FontAlignVSpinner;
-Etk_Widget *UI_FontAlignHSpinner;
-Etk_Widget *UI_AspectMinSpinner;
-Etk_Widget *UI_AspectMaxSpinner;
-Etk_Widget *UI_AspectComboBox;
-Etk_Widget *UI_StateMinWSpinner;
-Etk_Widget *UI_StateMinHSpinner;
-Etk_Widget *UI_StateMaxWSpinner;
-Etk_Widget *UI_StateMaxHSpinner;
-Etk_Widget *UI_StateAlignVSpinner;
-Etk_Widget *UI_StateAlignHSpinner;
-Etk_Widget *UI_ProgramEntry;
-Etk_Widget *UI_SignalEntry;
+/* script frame objects */
Etk_Widget *UI_ScriptBox;
Etk_Widget *UI_ScriptSaveButton;
+/* program frame objects */
+Etk_Widget *UI_ProgramEntry;
+Etk_Widget *UI_SignalEntry;
Etk_Widget *UI_ActionComboBox;
Etk_Widget *UI_TransiComboBox;
Etk_Widget *UI_TransiLabel;
@@ -105,10 +114,7 @@
Etk_Widget *UI_Param2Label;
Etk_Widget *UI_DelayFromSpinner;
Etk_Widget *UI_DelayRangeSpinner;
-Etk_Widget *UI_CurrentGroupSizeLabel;
-Etk_Widget *UI_PartEventsCheck;
-Etk_Widget *UI_PartEventsRepeatCheck;
-
+/* etk_embed objects */
Etk_Widget *UI_PartsTreeEmbed;
Etk_Widget *UI_GroupEmbed;
Etk_Widget *UI_PartEmbed;
@@ -120,42 +126,42 @@
Etk_Widget *UI_ScriptEmbed;
Etk_Widget *UI_ImageEmbed;
Etk_Widget *UI_ToolbarEmbed;
-
-//Evas_Object *UI_PartEdje;
+/* colors objects*/
+Evas_Object *RectColorObject;
+Evas_Object *TextColorObject;
+Evas_Object *ShadowColorObject;
+Evas_Object *OutlineColorObject;
Evas_Object *edje_ui;
-#if TEST_DIRECT_EDJE
-Etk_Widget *UI_GroupsComboBox;
-void AddGroupToTree2 (char *name);
-void AddPartToTree2(char *part_name);
-void AddStateToTree2(char *part_name, char *state_name);
-#endif
+void create_main_window(void);
-void create_main_window (void);
-void ecore_resize_callback (Ecore_Evas *ecore_evas);
-void _embed_position_set (void *position_data, int *x, int *y);
-void PopulateTree (void);
-void AddGroupToTree (Engrave_Group* group);
-void AddPartToTree (Engrave_Part* part, int place_after, Engrave_Part* after);
-void AddStateToTree (Engrave_Part_State* state);
-void AddProgramToTree (Engrave_Program* prog);
-void PopulateRelComboBoxes (void);
-void PopulateImagesComboBox (void);
-void PopulateFontsComboBox (void);
-void PopulateSourceComboBox (void);
-void UpdateGroupFrame (void);
-void UpdatePositionFrame (void);
-void UpdateComboPositionFrame(void);
-void UpdateImageFrame (void);
-void UpdateTextFrame (void);
-void UpdatePartFrame (void);
-void UpdateRectFrame (void);
-void UpdateDescriptionFrame (void);
-void UpdateProgFrame (void);
-void UpdateScriptFrame (void);
-void UpdateWindowTitle (void);
-void ShowFilechooser (int FileChooserType);
-void ShowAlert (char* text);
+Etk_Tree_Row *AddPartToTree(const char *part_name);
+Etk_Tree_Row *AddStateToTree(const char *part_name, const char *state_name);
+Etk_Tree_Row *AddProgramToTree(const char* prog);
+
+void PopulateGroupsComboBox(void);
+void PopulateTree(void);
+void PopulateRelComboBoxes(void);
+void PopulateImagesComboBox(void);
+void PopulateFontsComboBox(void);
+void PopulateSourceComboBox(void);
+
+void UpdateGroupFrame(void);
+void UpdatePositionFrame(void);
+void UpdateComboPositionFrame(void);
+void UpdateImageFrame(void);
+void UpdateTextFrame(void);
+void UpdatePartFrame(void);
+void UpdateRectFrame(void);
+void UpdateDescriptionFrame(void);
+void UpdateProgFrame(void);
+void UpdateScriptFrame(void);
+void UpdateWindowTitle(void);
+
+void ShowFilechooser(int FileChooserType);
+void ShowAlert(char* text);
+
+#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- main.c 7 Feb 2008 17:29:53 -0000 1.27
+++ main.c 15 Feb 2008 21:41:21 -0000 1.28
@@ -2,9 +2,7 @@
#include <string.h>
#include <errno.h>
#include <Edje.h>
-#if TEST_DIRECT_EDJE
- #include <Edje_Edit.h>
-#endif
+#include <Edje_Edit.h>
#include <Etk.h>
#include <Engrave.h>
#include <Ecore_Str.h>
@@ -29,231 +27,17 @@
evas_object_resize(EdjeTest_bg, w , h );
evas_object_resize(EdjeTest_edje, w , h );
}
-/**
- * engrave_part_state_image_tween_remove_nth - Remove the nth image from the tween list.
- * @param eps: The Engrave_Part_State to remove the image to.
- * @param tween_num: The number of the image to remove from the tween list.
- *
- * @return Returns no value
- */
-/*EAPI*/ void
-PROTO_engrave_part_state_image_tween_remove_nth(Engrave_Part_State *eps,
- int tween_num)
-{
- Evas_List *l;
-
- if ((!eps) || (tween_num < 0)) return;
-
- l = evas_list_nth_list (eps->image.tween, tween_num);
- //printf("Remove tween num: %d (%s)\n",tween_num,((Engrave_Image*)(l->data))->name);
- if (!l) return;
-
- eps->image.tween = evas_list_remove_list (eps->image.tween, l);
-}
-/**
- * engrave_part_state_image_tween_remove_all - Clear the tween list for a state.
- * @param eps: The Engrave_Part_State that contain the list to clear.
- *
- * @return Returns no value
- */
-/*EAPI*/ void
-PROTO_engrave_part_state_image_tween_remove_all(Engrave_Part_State *eps)
-{
- if (!eps && !eps->image.tween) return;
- eps->image.tween = evas_list_free(eps->image.tween);
-}
-/**
- * engrave_part_state_remove - remove the state from the part.
- * @param ep: The Engrave_Part to remove the state to.
- * @param eps: The Engrave_Part_State to remove.
- *
- * @return Returns no value.
- */
-/*EAPI*/ void
-PROTO_engrave_part_state_remove(Engrave_Part *ep, Engrave_Part_State *eps)
-{
- if (!eps || !ep) return;
-
- //If eps its the current one then set current to NULL
- if (eps == engrave_part_current_state_get(ep))
- ep->current_state = NULL;
-
- engrave_part_state_parent_set(eps, NULL);
-
- ep->states = evas_list_remove(ep->states, eps);
-}
-
-/**
- * engrave_group_part_remove - remove the given part from the group
- * @param eg: The Engrave_Group to remove the part too.
- * @param ep: The Engrave_Part to remove.
- *
- * @return Returns no value.
- */
-/*EAPI*/ void
-PROTO_engrave_group_part_remove(Engrave_Group *eg, Engrave_Part *ep)
-{
- Engrave_Group * group;
- Evas_List * list;
-
- if (!eg || !ep) return;
-
- group = (Engrave_Group *) engrave_part_parent_get(ep);
-
- if (ep->name)
- {
- // for all the programs in the group
- for (list = group->programs; list; list = list->next)
- {
- Engrave_Program * ep2;
- Evas_List * list2;
- ep2 = (Engrave_Program *) list->data;
-
- // if source matches, update
- if (ep2->source && !strcmp(ep2->source, ep->name))
- IF_FREE(ep2->source);
-
- // if any of the targets match, update too
- for (list2 = ep2->targets; list2; list2 = list2->next)
- {
- char * n;
- n = (char *) list2->data;
- if (n && !strcmp(n, ep->name))
- {
- ep2->targets = evas_list_remove(ep2->targets, n);
- IF_FREE(n);
- }
- }
- }
-
- // for all other parts in the group
- for (list = group->parts; list; list = list->next)
- {
- Engrave_Part * ep2;
- Evas_List * list2;
-
- ep2 = (Engrave_Part *) list->data;
- // for each state
- for (list2 = ep2->states; list2; list2 = list2->next)
- {
- Engrave_Part_State * eps2;
- eps2 = (Engrave_Part_State *) list2->data;
-
- if (eps2->rel1.to_x != NULL && !strcmp(eps2->rel1.to_x, ep->name))
- IF_FREE(eps2->rel1.to_x);
-
- if (eps2->rel1.to_y != NULL && !strcmp(eps2->rel1.to_y, ep->name))
- IF_FREE(eps2->rel1.to_y);
-
- if (eps2->rel2.to_x != NULL && !strcmp(eps2->rel2.to_x, ep->name))
- IF_FREE(eps2->rel2.to_x);
-
- if (eps2->rel2.to_y != NULL && !strcmp(eps2->rel2.to_y, ep->name))
- IF_FREE(eps2->rel2.to_y);
- }
- }
- }
- if (ep->object) evas_object_del(ep->object);
-
- eg->parts = evas_list_remove(eg->parts,ep);
- engrave_part_parent_set(ep, NULL);
-}
-
-/**
- * engrave_group_program_remove - remove the given program from the group
- * @param eg: The Engrave_Group to remove the program too.
- * @param ep: The Engrave_Program to remove.
- *
- * @return Returns no value.
- */
-/*EAPI*/ void
-PROTO_engrave_group_program_remove(Engrave_Group *eg, Engrave_Program *epr) {
- Evas_List * list;
-
- if (!eg || !epr) return;
-
- eg->programs = evas_list_remove(eg->programs, epr);
- engrave_program_parent_set(epr, NULL);
-
-}
-
-/**
- * engrave_file_group_remove - remove the group from the given file
- * @param ef: The Engrave_File to remove the group too.
- * @param eg: The Engrave_Group to remove.
- *
- * @return Returns no value.
- */
-/*EAPI*/ void
-PROTO_engrave_file_group_remove(Engrave_File *ef, Engrave_Group *eg)
-{
- if (!ef || !eg) return;
-
- // if (ecanvas.current_group == eg) TODO: quando le altre due sono state "commesse"
- // ecanvas.current_group = NULL;
- ef->groups = evas_list_remove(ef->groups, eg);
- engrave_group_parent_set(eg, NULL);
-}
-void
-PROTO_engrave_part_raise(Engrave_Part *ep)
-{
- Engrave_Group *eg;
- Engrave_Part *next;
- Evas_List *l;
-
- if (!ep) return;
-
- eg = ep->parent;
- if (!eg) return;
-
- printf("RAISE part: '%s' in group: '%s'\n",ep->name, eg->name);
-
- l = evas_list_find_list(eg->parts, ep);
- if (!l || !l->next) return;
-
- next = l->next->data;
- eg->parts = evas_list_remove (eg->parts, ep);
- eg->parts = evas_list_append_relative (eg->parts, ep, next);
-}
-int
-PROTO_engrave_part_lower(Engrave_Part *ep)
-{
- Engrave_Group *eg;
- Engrave_Part *prev;
- Evas_List *l;
-
- if (!ep) return FALSE;
-
- eg = ep->parent;
- if (!eg) return FALSE;
-
- printf("LOWER part: '%s' in group: '%s'\n",ep->name, eg->name);
-
- l = evas_list_find_list(eg->parts, ep);
- if (!l || !l->prev) return FALSE;
-
- prev = l->prev->data;
- eg->parts = evas_list_remove (eg->parts, ep);
- eg->parts = evas_list_prepend_relative (eg->parts, ep, prev);
-
- //evas_object_lower(ep->object);
- return TRUE;
-}
-#if TEST_DIRECT_EDJE
Evas_Bool
_DebugInfo_helper(Evas_Hash *hash, const char *key, void *data, void *fdata)
{
- printf("Key: '%s' [%d]\n", key, data);
+ printf("Key: '%s' [%d]\n", key, (int)data);
+ return TRUE;
}
+
void
DebugInfo(int full)
{
- Engrave_Group *gro;
- Engrave_Part *par;
- Engrave_Part_State *sta;
- Evas_List *gp,*pp,*sp;
-
printf("\n\n ********************* D E B U G ***************************\n");
printf(" ** open file name: %s\n",Cur.edj_file_name->string);
printf(" ** temp file name: %s\n",Cur.edj_temp_name->string);
@@ -278,73 +62,7 @@
evas_hash_foreach(Parts_Hash, _DebugInfo_helper, NULL);
printf(" *********************** E N D *****************************\n\n");
}
-#else
-void
-DebugInfo(int full)
-{
- Engrave_Group *gro;
- Engrave_Part *par;
- Engrave_Part_State *sta;
- Evas_List *gp,*pp,*sp;
- printf("\n\n ********************* D E B U G ***************************\n");
- printf(" ** open file name: %s\n",Cur.open_file_name);
- printf(" ** main source file: %s\n",Cur.main_source_file);
- printf(" ** sources directory: %s\n",Cur.source_dir);
- printf(" ** images directory: %s\n",engrave_file_image_dir_get(Cur.ef));
- printf(" ** fonts directory: %s\n",engrave_file_font_dir_get(Cur.ef));
- printf(" **\n");
- printf(" ** edje_editor.edj: %s\n",EdjeFile);
- /* printf("Current engrave file: %s\n",Cur.ef->);
- printf("Current EDCFileDir: %s\n",EDCFileDir->str);
- */
- printf(" ** Tot groups: %d\n",engrave_file_groups_count (Cur.ef));
- printf(" ** Tot images: %d\n",engrave_file_images_count (Cur.ef));
- printf(" ** Tot fonts: %d\n",engrave_file_fonts_count (Cur.ef));
- printf(" ** Tot spectra: %d\n",engrave_file_spectra_count (Cur.ef));
- printf(" ** Tot styles: %d\n",engrave_file_styles_count (Cur.ef));
- printf(" ** Tot data: %d\n",engrave_file_data_count (Cur.ef));
- printf(" **\n");
- if (Cur.eg)
- printf(" ** Cur group: %s\n",Cur.eg->name);
- else
- printf(" ** Cur group: (NULL)\n");
- if (Cur.ep)
- printf(" ** Cur part: %s\n",Cur.ep->name);
- else
- printf(" ** Cur part: (NULL)\n");
- if (Cur.eps)
- printf(" ** Cur state: %s %.2f\n",Cur.eps->name, Cur.eps->value);
- else
- printf(" ** Cur state: (NULL)\n");
- if (Cur.epr)
- printf(" ** Cur program: %s\n",Cur.epr->name);
- else
- printf(" ** Cur program: (NULL)\n");
-
- if (full)
- {
- printf(" ********************* F U L L **********************\n");
- for (gp = Cur.ef->groups; gp ;gp = gp->next)
- {
- gro = gp->data;
- printf(" ** Group: %s (%d par)\n",gro->name,engrave_group_parts_count(gro));
- for (pp = gro->parts; pp ;pp = pp->next)
- {
- par = pp->data;
- printf(" ** Part: %s \n",par->name);
- for (sp = par->states; sp; sp = sp->next)
- {
- sta = sp->data;
- printf(" ** State: %s %.2f\n",sta->name,sta->value);
- }
- }
- }
- }
-
- printf(" *********************** E N D *****************************\n\n");
-}
-#endif
void
TestEdjeGroup(char *File,char *Group)
{
@@ -406,14 +124,14 @@
printf(" To open an EDC file you must pass the IMAGE_DIR and FONT_DIR\n");
printf(" parameters. If not given the EDC directory is assumed.\n\n");
}
-#if TEST_DIRECT_EDJE
+
void
ChangeGroup(char *group)
{
if (!group) return;
if (Cur.group->string && !strcmp(group, Cur.group->string)) return;
- printf("Change group: %s\n", group);
+ printf("Change to group: %s\n", group);
edje_edit_save(edje_o);
evas_object_hide(edje_o);
edje_object_file_set(edje_o, Cur.edj_temp_name->string, group);
@@ -425,7 +143,7 @@
Cur.state = etk_string_clear(Cur.state);
- PopulateTree2();
+ PopulateTree();
PopulateRelComboBoxes();
UpdateGroupFrame();
@@ -435,11 +153,17 @@
}
int
-LoadEDJ2(char *file)
+LoadEDJ(char *file)
{
+ unsigned char new_file = 0;
char *realp = NULL;
char *old_temp;
- if (!file) return 0;
+
+ if (!file)
+ {
+ file = PACKAGE_DATA_DIR"/blank.edj";
+ new_file = 1;
+ }
printf("** Load EDJ: '%s'\n",file);
@@ -485,10 +209,17 @@
return 0;
}
+ if (new_file)
+ {
+ Cur.edj_file_name = etk_string_clear(Cur.edj_file_name);
+ ecore_evas_title_set(UI_ecore_MainWin, "Untitled");
+ }
+ else
+ {
+ Cur.edj_file_name = etk_string_set(Cur.edj_file_name, realp);
+ ecore_evas_title_set(UI_ecore_MainWin, Cur.edj_file_name->string);
+ }
- Cur.edj_file_name = etk_string_set(Cur.edj_file_name, realp);
-
- ecore_evas_title_set(UI_ecore_MainWin, Cur.edj_file_name->string);
Cur.group = etk_string_clear(Cur.group);
Cur.part = etk_string_clear(Cur.part);
@@ -511,7 +242,7 @@
if (old_temp) free(old_temp);
return 1;
}
-#endif
+
/* main */
@@ -522,7 +253,6 @@
Cur.eg = NULL;
Cur.ep = NULL;
Cur.eps = NULL;
- Cur.ef = NULL;
Cur.open_file_name = NULL;
Cur.source_dir = NULL;
Cur.main_source_file = NULL;
@@ -577,17 +307,16 @@
//Create the etk window and all the widgets
create_main_window();
-#if TEST_DIRECT_EDJE
printf("*********************************\n");
printf("Testing edje direct access!!...\n");
printf("*********************************\n");
- double val = 1.2;
- printf("TEST:\n");
setlocale(LC_NUMERIC,"C");
- sscanf("3.2","%lf", &val);
- printf("%f\n", val);
+ //printf("LOCALE TEST:\n");
+ //double val = 1.2;
+ //sscanf("3.2","%lf", &val);
+ //printf("%f\n", val);
Cur.edj_file_name = etk_string_new("");
Cur.edj_temp_name = etk_string_new("");
@@ -597,69 +326,25 @@
Cur.prog = etk_string_new("");
- //~ //Create temp file
- //~ char tmpn[1024];
- //~ int fd = 0;
- //~ strcpy(tmpn, "/tmp/edje_editor_tmp.edj-XXXXXX");
- //~ fd = mkstemp(tmpn);
- //~ if (fd < 0)
- //~ {
- //~ printf("Can't create temp file '%s'\nError: %s\n", tmpn, strerror(errno));
- //~ return 1;
- //~ }
- //~ Cur.edj_temp_name = etk_string_set(Cur.edj_temp_name, tmpn);
-
//Open a file from command line
if (argc == 2)
{
printf("Opening edje file: '%s'\n",argv[1]);
- LoadEDJ2(argv[1]);
+ LoadEDJ(argv[1]);
}
-
-#else
- //Open a file
- if (argc > 1)
+ else
+ //Open blank.edj
{
- char *file = ecore_file_realpath(argv[1]);
- if (!ecore_file_exists(file)){
- printf("File not exists: '%s'\n",argv[1]);
- return 1;
- }
- if (ecore_str_has_suffix(file, ".edj"))
- LoadEDJ(file);
- else if (ecore_str_has_suffix(file, ".edc"))
- {
- char *edc_dir = ecore_file_dir_get(file);
- if (argc == 2)
- Cur.ef = engrave_load_edc(file, edc_dir, edc_dir);
- if (argc == 3)
- Cur.ef = engrave_load_edc(file, argv[2], edc_dir);
- if (argc == 4)
- Cur.ef = engrave_load_edc(file, argv[2], argv[3]);
- }
- ecore_evas_title_set(UI_ecore_MainWin, file);
+ LoadEDJ(NULL);
}
-
- if (!Cur.ef)
- Cur.ef = engrave_file_new();
-
- engrave_canvas_file_set (engrave_canvas, Cur.ef);
-
- //Populate Interface
- PopulateTree();
- PopulateImagesComboBox();
- PopulateFontsComboBox();
-
-#endif
+
//DebugInfo(FALSE);
//Start main loop
etk_main();
-#if TEST_DIRECT_EDJE
//Remove temp file
ecore_file_unlink(Cur.edj_temp_name->string); //TODO move this line down (when don't use etk_string anymore)
-#endif
etk_shutdown();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- main.h 28 Dec 2007 23:01:41 -0000 1.22
+++ main.h 15 Feb 2008 21:41:21 -0000 1.23
@@ -1,5 +1,5 @@
-#ifndef INCLUSION_GUARD
-#define INCLUSION_GUARD
+#ifndef _EDJE_EDITOR_MAIN_H_
+#define _EDJE_EDITOR_MAIN_H_
#include <Engrave.h>
#include <Edje.h>
@@ -13,14 +13,14 @@
#define FAKEWIN_BORDER_RIGHT 4
#define FAKEWIN_BORDER_BOTTOM 4
-#define TEST_DIRECT_EDJE 0
-#define ECHO_EDJE_SIGNAL 0
-#define DEBUG_TREE 0
+#define USE_GL_ENGINE 0
+#define ECHO_EDJE_SIGNAL 0
+#define DEBUG_TREE 0
#if DEBUG_TREE
- #define TREE_WIDTH 365
+ #define TREE_WIDTH 365
#else
- #define TREE_WIDTH 265
+ #define TREE_WIDTH 265
#endif
#undef FREE
@@ -36,7 +36,6 @@
val = NULL; \
}
-
//All the enum used are declared here
enum various
{
@@ -114,7 +113,7 @@
struct Current_State
{
- Engrave_File *ef;
+ // Engrave_File *ef;
Engrave_Group *eg;
Engrave_Part *ep;
Engrave_Program *epr;
@@ -122,7 +121,7 @@
char *open_file_name; //Full path to the open edje file
char *source_dir; //Full path to sources
char *main_source_file; //Full path to the main edc file
-#if TEST_DIRECT_EDJE
+
Etk_String *group;
Etk_String *part;
Etk_String *state;
@@ -131,7 +130,6 @@
Etk_String *edj_file_name;
Etk_String *edj_temp_name;
-#endif
}Cur;
/* GLOBALS */
@@ -140,7 +138,7 @@
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
@@ -152,9 +150,9 @@
Ecore_Hash *hash; //Associate the engrave objects with the tree_rows
/* FUNCTION PROTOTYPES*/
-void DebugInfo (int full);
+void DebugInfo(int full);
+int LoadEDJ(char *file);
-#if TEST_DIRECT_EDJE
//This define is copied from edje_private.h (find a way to export it)
#define EDJE_PART_TYPE_NONE 0
@@ -185,6 +183,6 @@
void ChangeGroup(char *group);
-#endif
+
#endif // INCLUSION_GUARD
|