Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_group.c edje_editor_toolbar.c edje_editor_tree.c
edje_editor_tree.h edje_editor_window.c main.c
Log Message:
cleans & renames of edje_editor_tree.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_group.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_group.c 2 Jul 2008 14:08:41 -0000 1.3
+++ edje_editor_group.c 2 Jul 2008 16:55:44 -0000 1.4
@@ -226,10 +226,10 @@
Etk_Combobox_Item *item;
item = etk_combobox_active_item_get(ETK_COMBOBOX(UI_GroupsComboBox));
etk_signal_block("item-activated",ETK_OBJECT(UI_GroupsComboBox),
- on_GroupsComboBox_activated, NULL);
+ _tree_combobox_activated_cb, NULL);
etk_combobox_item_fields_set(item, name);
etk_signal_unblock("item-activated",ETK_OBJECT(UI_GroupsComboBox),
- on_GroupsComboBox_activated, NULL);
+ _tree_combobox_activated_cb, NULL);
//Update FakeWin title
edje_object_part_text_set(EV_fakewin, "title", name);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_editor_toolbar.c 2 Jul 2008 16:42:31 -0000 1.6
+++ edje_editor_toolbar.c 2 Jul 2008 16:55:45 -0000 1.7
@@ -367,7 +367,7 @@
break;
}
- row = AddPartToTree(name, NULL);
+ row = tree_part_add(name, NULL);
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
@@ -392,7 +392,7 @@
break;
}
//TODO generate a unique new name
- row = AddPartToTree(name, NULL);
+ row = tree_part_add(name, NULL);
Evas_List *images;
@@ -427,7 +427,7 @@
dialog_alert_show("Can't create part.");
break;
}
- row = AddPartToTree(name, NULL);
+ row = tree_part_add(name, NULL);
char *font;
item = etk_combobox_first_item_get(ETK_COMBOBOX(UI_FontComboBox));
@@ -464,7 +464,7 @@
dialog_alert_show("Can't create part.");
break;
}
- row = AddPartToTree(name, NULL);
+ row = tree_part_add(name, NULL);
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
@@ -487,7 +487,7 @@
dialog_alert_show("Can't create part.");
break;
}
- row = AddPartToTree(name, NULL);
+ row = tree_part_add(name, NULL);
etk_tree_row_select(row);
etk_tree_row_unfold(row);
position_comboboxes_populate();
@@ -521,7 +521,7 @@
edje_edit_state_text_size_set(edje_o, Cur.part->string, name2, 16);
//Add state to tree
- row = AddStateToTree(Cur.part->string, name2);
+ row = tree_state_add(Cur.part->string, name2);
etk_tree_row_select(row);
etk_tree_row_unfold(evas_hash_find(Parts_Hash,Cur.part->string));
break;
@@ -543,7 +543,7 @@
dialog_alert_show("ERROR: can't add program");
break;
}
- row = AddProgramToTree(name);
+ row = tree_program_add(name);
etk_tree_row_select(row);
etk_tree_row_scroll_to(row, ETK_FALSE);
break;
@@ -557,7 +557,7 @@
if (edje_edit_group_add(edje_o, name))
{
- PopulateGroupsComboBox();
+ tree_combobox_populate();
etk_combobox_active_item_set(ETK_COMBOBOX(UI_GroupsComboBox),
etk_combobox_last_item_get(ETK_COMBOBOX(UI_GroupsComboBox)));
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- edje_editor_tree.c 2 Jul 2008 16:31:19 -0000 1.10
+++ edje_editor_tree.c 2 Jul 2008 16:55:45 -0000 1.11
@@ -2,24 +2,22 @@
#include <Edje.h>
#include <Edje_Edit.h>
#include "main.h"
-//#include "callbacks.h"
-//#include "interface.h"
-
-
+/*** Implementation ***/
Etk_Widget*
-create_tree(void)
+tree_create(void)
{
//UI_GroupsComboBox
UI_GroupsComboBox = etk_combobox_new();
etk_combobox_items_height_set(ETK_COMBOBOX(UI_GroupsComboBox), 18);
- etk_combobox_column_add(ETK_COMBOBOX(UI_GroupsComboBox),
ETK_COMBOBOX_LABEL, 30, ETK_COMBOBOX_NONE, 0.0);
+ 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_signal_connect("item-activated", ETK_OBJECT(UI_GroupsComboBox),
- ETK_CALLBACK(on_GroupsComboBox_activated), NULL);
-
+ ETK_CALLBACK(_tree_combobox_activated_cb), NULL);
+
//UI_PartsTree
Etk_Tree_Col *col;
UI_PartsTree = etk_tree_new();
@@ -54,25 +52,25 @@
etk_tree_build(ETK_TREE(UI_PartsTree));
etk_signal_connect("row-selected", ETK_OBJECT(UI_PartsTree),
- ETK_CALLBACK(on_PartsTree_row_selected), NULL);
+ ETK_CALLBACK(_tree_row_selected_cb), NULL);
etk_signal_connect("row-clicked", ETK_OBJECT(UI_PartsTree),
- ETK_CALLBACK(on_PartsTree_click), NULL);
-
+ ETK_CALLBACK(_tree_click_cb), NULL);
+
//vbox
Etk_Widget *vbox;
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_box_append(ETK_BOX(vbox), UI_GroupsComboBox, ETK_BOX_START,
ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(vbox), UI_PartsTree, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-
+
return vbox;
}
void
-PopulateTree(void)
+tree_populate(void)
{
Evas_List *parts, *pp;
Evas_List *progs;
-
+
etk_tree_freeze(ETK_TREE(UI_PartsTree));
etk_tree_clear(ETK_TREE(UI_PartsTree));
@@ -80,33 +78,31 @@
while(pp)
{
printf(" P: %s\n", (char*)pp->data);
- AddPartToTree((char*)pp->data, NULL);
+ tree_part_add((char*)pp->data, NULL);
pp = pp->next;
}
edje_edit_string_list_free(parts);
-
+
progs = pp = edje_edit_programs_list_get(edje_o);
while(pp)
{
- AddProgramToTree((char*)pp->data);
+ tree_program_add((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)
+tree_combobox_populate(void)
{
Evas_List *groups, *l;
//Stop signal propagation
etk_signal_block("item-activated",ETK_OBJECT(UI_GroupsComboBox),
- on_GroupsComboBox_activated, NULL);
+ _tree_combobox_activated_cb, NULL);
etk_signal_block("item-activated",ETK_OBJECT(UI_PartSourceComboBox),
_part_SourceComboBox_item_activated_cb, NULL);
@@ -126,7 +122,7 @@
//Renable signal propagation
etk_signal_unblock("item-activated",ETK_OBJECT(UI_GroupsComboBox),
- on_GroupsComboBox_activated, NULL);
+ _tree_combobox_activated_cb, NULL);
etk_signal_unblock("item-activated",ETK_OBJECT(UI_PartSourceComboBox),
_part_SourceComboBox_item_activated_cb, NULL);
@@ -135,9 +131,8 @@
etk_combobox_first_item_get(ETK_COMBOBOX(UI_GroupsComboBox)));
}
-
Etk_Tree_Row *
-AddPartToTree(const char *part_name, Etk_Tree_Row *after)
+tree_part_add(const char *part_name, Etk_Tree_Row *after)
{
/* If after=0 then append to the tree (but before programs)
If after=1 then prepend to the tree
@@ -194,7 +189,7 @@
states = sp = edje_edit_part_states_list_get(edje_o, part_name);
while(sp)
{
- AddStateToTree(part_name, (char*)sp->data);
+ tree_state_add(part_name, (char*)sp->data);
sp = sp->next;
}
edje_edit_string_list_free(states);
@@ -204,7 +199,7 @@
}
Etk_Tree_Row *
-AddStateToTree(const char *part_name, const char *state_name)
+tree_state_add(const char *part_name, const char *state_name)
{
Etk_Tree_Row *row;
@@ -221,7 +216,7 @@
}
Etk_Tree_Row *
-AddProgramToTree(const char* prog)
+tree_program_add(const char* prog)
{
Etk_Tree_Row *row = NULL;
@@ -235,9 +230,10 @@
return row;
}
-/* Tree callbacks */
+
+/*** Tree callbacks ***/
Etk_Bool
-on_PartsTree_row_selected(Etk_Object *object, Etk_Tree_Row *row, void *data)
+_tree_row_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void *data)
{
int row_type=0;
char *name;
@@ -279,7 +275,8 @@
Cur.tween = etk_string_clear(Cur.tween);
Cur.prog = etk_string_clear(Cur.prog);
- edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string);
+ edje_edit_part_selected_state_set(edje_o, Cur.part->string,
+ Cur.state->string);
state_frame_update();
position_frame_update();
@@ -342,23 +339,25 @@
return ETK_TRUE;
}
-/* Group combobox callback */
Etk_Bool
-on_GroupsComboBox_activated(Etk_Combobox *combobox, Etk_Combobox_Item *item,
void *data)
+_tree_click_cb(Etk_Tree *tree, Etk_Tree_Row *row, Etk_Event_Mouse_Up *event,
void *data)
{
- char *gr;
- gr = etk_combobox_item_field_get(item,0);
- //printf("Group combo activated: %s\n",gr);
- ChangeGroup(gr);
+ if ((event->flags == ETK_MOUSE_DOUBLE_CLICK) &&
etk_string_length_get(Cur.prog))
+ edje_edit_program_run(edje_o, Cur.prog->string);
return ETK_TRUE;
}
+
+/*** Group combobox callback ***/
Etk_Bool
-on_PartsTree_click(Etk_Tree *tree, Etk_Tree_Row *row, Etk_Event_Mouse_Up
*event, void *data)
+_tree_combobox_activated_cb(Etk_Combobox *combobox, Etk_Combobox_Item *item,
void *data)
{
- if ((event->flags == ETK_MOUSE_DOUBLE_CLICK) &&
etk_string_length_get(Cur.prog))
- edje_edit_program_run(edje_o, Cur.prog->string);
+ char *gr;
+ gr = etk_combobox_item_field_get(item,0);
+ //printf("Group combo activated: %s\n",gr);
+ ChangeGroup(gr);
return ETK_TRUE;
}
+
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_tree.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_tree.h 2 Jul 2008 16:55:45 -0000 1.2
@@ -12,21 +12,22 @@
#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)
+
Etk_Widget *UI_PartsTree;
Etk_Widget *UI_GroupsComboBox;
-Etk_Widget* create_tree(void);
-void PopulateTree(void);
-void PopulateGroupsComboBox(void);
-Etk_Tree_Row *AddPartToTree(const char *part_name, Etk_Tree_Row *after);
-Etk_Tree_Row *AddStateToTree(const char *part_name, const char *state_name);
-Etk_Tree_Row *AddProgramToTree(const char* prog);
+Etk_Widget* tree_create (void);
+void tree_populate (void);
+void tree_combobox_populate (void);
+Etk_Tree_Row* tree_part_add (const char *part_name, Etk_Tree_Row
*after);
+Etk_Tree_Row* tree_state_add (const char *part_name, const char
*state_name);
+Etk_Tree_Row* tree_program_add (const char* prog);
-Etk_Bool on_GroupsComboBox_activated(Etk_Combobox *combobox, Etk_Combobox_Item
*item, void *data);
-Etk_Bool on_PartsTree_row_selected (Etk_Object *object, Etk_Tree_Row
*row, void *data);
-Etk_Bool on_PartsTree_click (Etk_Tree *tree, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data);
+Etk_Bool _tree_combobox_activated_cb (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
+Etk_Bool _tree_row_selected_cb (Etk_Object *object, Etk_Tree_Row *row,
void *data);
+Etk_Bool _tree_click_cb (Etk_Tree *tree, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_editor_window.c 2 Jul 2008 16:42:31 -0000 1.14
+++ edje_editor_window.c 2 Jul 2008 16:55:45 -0000 1.15
@@ -159,7 +159,7 @@
//TreeEmbed
UI_PartsTreeEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_PartsTreeEmbed), create_tree());
+ etk_container_add(ETK_CONTAINER(UI_PartsTreeEmbed), tree_create());
etk_embed_position_method_set(ETK_EMBED(UI_PartsTreeEmbed),
_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_PartsTreeEmbed);
@@ -390,9 +390,9 @@
etk_tree_row_delete(row);
if (prev)
- row = AddPartToTree(Cur.part->string, prev);
+ row = tree_part_add(Cur.part->string, prev);
else
- row = AddPartToTree(Cur.part->string, (void*)1);
+ row = tree_part_add(Cur.part->string, (void*)1);
etk_tree_row_select(row);
//Reload the edje if needed
if (edje_edit_part_type_get(edje_o, Cur.part->string) ==
EDJE_PART_TYPE_GROUP)
@@ -414,7 +414,7 @@
Parts_Hash = evas_hash_del(Parts_Hash, NULL, row);
etk_tree_row_delete(row);
- row = AddPartToTree(Cur.part->string, next);
+ row = tree_part_add(Cur.part->string, next);
etk_tree_row_select(row);
//Reload the edje if needed
if (edje_edit_part_type_get(edje_o, Cur.part->string) ==
EDJE_PART_TYPE_GROUP)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- main.c 2 Jul 2008 16:42:31 -0000 1.51
+++ main.c 2 Jul 2008 16:55:45 -0000 1.52
@@ -161,7 +161,7 @@
Cur.tween = etk_string_clear(Cur.tween);
Cur.prog = etk_string_clear(Cur.prog);
- PopulateTree();
+ tree_populate();
position_comboboxes_populate();
program_source_combo_populate();
program_signal_combo_populate();
@@ -263,7 +263,7 @@
Cur.tween = etk_string_clear(Cur.tween);
Parts_Hash = NULL;
- PopulateGroupsComboBox();
+ tree_combobox_populate();
text_font_combo_populate();
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
