Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_consolle.c edje_editor_consolle.h
edje_editor_program.c edje_editor_window.c main.c main.h
Log Message:
cleans & renames of edje_editor_consolle.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_consolle.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_consolle.c 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_consolle.c 2 Jul 2008 02:48:58 -0000 1.2
@@ -4,9 +4,50 @@
#include <Edje_Edit.h>
#include "main.h"
+/*** Locals ***/
+static void _consolle_entry_item_append_ifnotexist(Etk_Widget *combo_entry,
const char *text);
+static Etk_Widget* _create_signal_embed(void);
-void
-emit_entry_item_append_ifnot(Etk_Widget *combo_entry, const char *text)
+static Etk_Widget *UI_SignalEmitEntry;
+static Etk_Widget *UI_SourceEmitEntry;
+
+/*** Callbacks ***/
+Etk_Bool
+_consolle_button_click_cb(Etk_Button *button, void *data)
+{
+ const char *sig, *sou;
+
+ sig =
etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry))));
+ sou =
etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry))));
+
+ edje_object_signal_emit(edje_o, sig, sou);
+
+ _consolle_entry_item_append_ifnotexist(UI_SignalEmitEntry, sig);
+ _consolle_entry_item_append_ifnotexist(UI_SourceEmitEntry, sou);
+
+ return ETK_TRUE;
+}
+
+Etk_Bool
+_consolle_combobox_entry_activated_cb(Etk_Combobox_Entry *combo, void *data)
+{
+ Etk_Combobox_Entry_Item *item;
+ Etk_Widget *entry;
+ char *str;
+
+ entry = etk_combobox_entry_entry_get(combo);
+ item = etk_combobox_entry_active_item_get(combo);
+
+ str = etk_combobox_entry_item_field_get(item, 0);
+ etk_entry_text_set(ETK_ENTRY(entry), str);
+
+ return ETK_TRUE;
+}
+
+
+/*** Internals ***/
+static void
+_consolle_entry_item_append_ifnotexist(Etk_Widget *combo_entry, const char
*text)
{
Etk_Combobox_Entry_Item *item;
char *str;
@@ -25,64 +66,8 @@
etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(combo_entry), text);
}
-Evas_Object *
-create_consolle(void)
-{
- Etk_Widget *embed;
-
- Consolle = edje_object_add(ecore_evas_get(UI_ecore_MainWin));
- edje_object_file_set(Consolle, EdjeFile, "Consolle");
- evas_object_show(Consolle);
-
- //Embed Signal Emit
- embed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(embed), create_signal_embed());
- etk_embed_position_method_set(ETK_EMBED(embed), _embed_position_set,
- UI_ecore_MainWin);
- etk_widget_show_all(embed);
- edje_object_part_swallow(Consolle,"signal_swallow",
- etk_embed_object_get(ETK_EMBED(embed)));
- return Consolle;
-}
-
-void
-ConsolleClear(void)
-{
- edje_object_part_text_set(Consolle, "line1", "");
- edje_object_part_text_set(Consolle, "line2", "");
- edje_object_part_text_set(Consolle, "line3", "");
- edje_object_part_text_set(Consolle, "line4", "");
- edje_object_part_text_set(Consolle, "line5", "");
-
- while(stack)
- {
- evas_stringshare_del(evas_list_data(stack));
- stack = evas_list_remove_list(stack, stack);
- }
- consolle_count = 0;
-}
-void
-ConsolleLog(char *text)
-{
- //printf("LOG: %s\n", text);
-
- stack = evas_list_prepend(stack, evas_stringshare_add(text));
-
- while (evas_list_count(stack) > 5)
- {
- evas_stringshare_del(evas_list_data(evas_list_last(stack)));
- stack = evas_list_remove_list(stack, evas_list_last(stack));
- }
-
- edje_object_part_text_set(Consolle, "line1", evas_list_nth(stack, 0));
- edje_object_part_text_set(Consolle, "line2", evas_list_nth(stack, 1));
- edje_object_part_text_set(Consolle, "line3", evas_list_nth(stack, 2));
- edje_object_part_text_set(Consolle, "line4", evas_list_nth(stack, 3));
- edje_object_part_text_set(Consolle, "line5", evas_list_nth(stack, 4));
-}
-
-Etk_Widget*
-create_signal_embed(void)
+static Etk_Widget*
+_create_signal_embed(void)
{
Etk_Widget *hbox;
Etk_Widget *label;
@@ -117,101 +102,70 @@
etk_box_append(ETK_BOX(hbox), button, 0, ETK_BOX_NONE, 0);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SignalEmitEntry),
- ETK_CALLBACK(on_SignalEmitEntry_activated), NULL);
+ ETK_CALLBACK(_consolle_combobox_entry_activated_cb),
NULL);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SourceEmitEntry),
- ETK_CALLBACK(on_SignalEmitEntry_activated), NULL);
+ ETK_CALLBACK(_consolle_combobox_entry_activated_cb),
NULL);
etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(on_AllButton_click), (void*)EMIT_SIGNAL);
+ ETK_CALLBACK(_consolle_button_click_cb), NULL);
return hbox;
}
-void
-PopulateSourceComboEntry(void)
+
+/*** Implementation ***/
+Evas_Object *
+consolle_create(void)
{
- Evas_List *l;
- char *image_name;
- printf("Populate Program Source ComboEntry\n");
-
- //Stop signal propagation
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_SourceEntry),
- ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
+ Etk_Widget *embed;
- etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(UI_SourceEntry));
+ EV_Consolle = edje_object_add(ecore_evas_get(UI_ecore_MainWin));
+ edje_object_file_set(EV_Consolle, EdjeFile, "Consolle");
+ evas_object_show(EV_Consolle);
- l = edje_edit_parts_list_get(edje_o);
- while (l)
- {
- image_name = GetPartTypeImage(edje_edit_part_type_get(edje_o,
(char*)l->data));
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
- etk_image_new_from_edje(EdjeFile, image_name),
- (char *)l->data);
- free(image_name);
-
- l = l->next;
- }
- edje_edit_string_list_free(l);
-
- //Renable signal propagation
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_SourceEntry),
- ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
+ //Embed Signal Emit
+ embed = etk_embed_new(UI_evas);
+ etk_container_add(ETK_CONTAINER(embed), _create_signal_embed());
+ etk_embed_position_method_set(ETK_EMBED(embed), _embed_position_set,
+ UI_ecore_MainWin);
+ etk_widget_show_all(embed);
+ edje_object_part_swallow(EV_Consolle,"signal_swallow",
+ etk_embed_object_get(ETK_EMBED(embed)));
+ return EV_Consolle;
}
void
-PopulateSignalComboEntry(void)
+consolle_clear(void)
{
- printf("Populate Program Signal ComboEntry\n");
+ edje_object_part_text_set(EV_Consolle, "line1", "");
+ edje_object_part_text_set(EV_Consolle, "line2", "");
+ edje_object_part_text_set(EV_Consolle, "line3", "");
+ edje_object_part_text_set(EV_Consolle, "line4", "");
+ edje_object_part_text_set(EV_Consolle, "line5", "");
- //Stop signal propagation
- etk_signal_block("active-item-changed", ETK_OBJECT(UI_SignalEntry),
- ETK_CALLBACK(on_SignalEntry_item_changed), NULL);
-
- etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(UI_SignalEntry));
-
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "program,start");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "program,stop");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "load");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "show");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "hide");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "resize");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,in");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,out");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,move");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,down,1");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,up,1");
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
- etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,clicked,1");
-
- //Renable signal propagation
- etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_SignalEntry),
- ETK_CALLBACK(on_SignalEntry_item_changed), NULL);
+ while(stack)
+ {
+ evas_stringshare_del(evas_list_data(stack));
+ stack = evas_list_remove_list(stack, stack);
+ }
+ consolle_count = 0;
}
-
-
-Etk_Bool
-on_SignalEmitEntry_activated(Etk_Combobox_Entry *combo, void *data)
+void
+consolle_log(char *text)
{
- Etk_Combobox_Entry_Item *item;
- Etk_Widget *entry;
- char *str;
+ //printf("LOG: %s\n", text);
- entry = etk_combobox_entry_entry_get(combo);
- item = etk_combobox_entry_active_item_get(combo);
-
- str = etk_combobox_entry_item_field_get(item, 0);
- etk_entry_text_set(ETK_ENTRY(entry), str);
+ stack = evas_list_prepend(stack, evas_stringshare_add(text));
- return ETK_TRUE;
+ while (evas_list_count(stack) > 5)
+ {
+ evas_stringshare_del(evas_list_data(evas_list_last(stack)));
+ stack = evas_list_remove_list(stack, evas_list_last(stack));
+ }
+
+ edje_object_part_text_set(EV_Consolle, "line1", evas_list_nth(stack, 0));
+ edje_object_part_text_set(EV_Consolle, "line2", evas_list_nth(stack, 1));
+ edje_object_part_text_set(EV_Consolle, "line3", evas_list_nth(stack, 2));
+ edje_object_part_text_set(EV_Consolle, "line4", evas_list_nth(stack, 3));
+ edje_object_part_text_set(EV_Consolle, "line5", evas_list_nth(stack, 4));
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_consolle.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_consolle.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_consolle.h 2 Jul 2008 02:48:58 -0000 1.2
@@ -2,21 +2,18 @@
#define _EDJE_EDITOR_CONSOLLE_H_
-Evas_Object *Consolle; //The lower consolle panel
-Etk_Widget *UI_SignalEmitEntry;
-Etk_Widget *UI_SourceEmitEntry;
+Evas_Object *EV_Consolle; //The lower consolle panel
-Evas_Object *create_consolle(void);
-void ConsolleLog(char *text);
-void ConsolleClear(void);
+Evas_Object* consolle_create(void);
+void consolle_log (char *text);
+void consolle_clear (void);
+
-Etk_Widget* create_signal_embed(void);
void PopulateSourceComboEntry(void);
void PopulateSignalComboEntry(void);
-void emit_entry_item_append_ifnot(Etk_Widget *combo_entry, const char *text);
-Etk_Bool on_SignalEmitEntry_activated (Etk_Combobox_Entry *combo, void
*data);
+
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_program.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_program.c 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_program.c 2 Jul 2008 02:48:58 -0000 1.2
@@ -401,6 +401,80 @@
etk_object_destroy(ETK_OBJECT(str));
}
+
+void
+PopulateSourceComboEntry(void)
+{
+ Evas_List *l;
+ char *image_name;
+ printf("Populate Program Source ComboEntry\n");
+
+ //Stop signal propagation
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_SourceEntry),
+ ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
+
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(UI_SourceEntry));
+
+ l = edje_edit_parts_list_get(edje_o);
+ while (l)
+ {
+ image_name = GetPartTypeImage(edje_edit_part_type_get(edje_o,
(char*)l->data));
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
+ etk_image_new_from_edje(EdjeFile, image_name),
+ (char *)l->data);
+ free(image_name);
+
+ l = l->next;
+ }
+ edje_edit_string_list_free(l);
+
+ //Renable signal propagation
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_SourceEntry),
+ ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
+}
+
+void
+PopulateSignalComboEntry(void)
+{
+ printf("Populate Program Signal ComboEntry\n");
+
+ //Stop signal propagation
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_SignalEntry),
+ ETK_CALLBACK(on_SignalEntry_item_changed), NULL);
+
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(UI_SignalEntry));
+
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "program,start");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "program,stop");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "load");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "show");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "hide");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "resize");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,in");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,out");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,move");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,down,1");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,up,1");
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SignalEntry),
+ etk_image_new_from_edje(EdjeFile, "DESC.PNG"), "mouse,clicked,1");
+
+ //Renable signal propagation
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_SignalEntry),
+ ETK_CALLBACK(on_SignalEntry_item_changed), NULL);
+}
+
+
Etk_Bool
on_ActionComboBox_changed(Etk_Combobox *combobox, void *data)
{
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_window.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_window.c 2 Jul 2008 02:48:58 -0000 1.3
@@ -246,7 +246,7 @@
//Consolle
- Consolle = create_consolle();
+ EV_Consolle = consolle_create();
//Filechooser
UI_FileChooserDialog = create_filechooser_dialog();
@@ -294,8 +294,8 @@
evas_object_resize(embed_object, TREE_WIDTH, win_h - 55);
//Resize Consolle
- evas_object_move(Consolle, TREE_WIDTH + 5, win_h - 105);
- evas_object_resize(Consolle, win_w - TREE_WIDTH - 10, 75);
+ evas_object_move(EV_Consolle, TREE_WIDTH + 5, win_h - 105);
+ evas_object_resize(EV_Consolle, win_w - TREE_WIDTH - 10, 75);
}
/* Catch all the signal from the editing edje object */
void
@@ -305,7 +305,7 @@
consolle_count++;
snprintf(buf, sizeof(buf), "[%d] SIGNAL = '%s' SOURCE = '%s'",
consolle_count, sig, src);
- ConsolleLog(buf);
+ consolle_log(buf);
}
@@ -321,7 +321,6 @@
const char *tween;
Etk_Tree_Row *row, *next, *prev;
Evas_List *icons, *l;
- const char *sig, *sou;
switch ((int)data)
{
@@ -513,13 +512,6 @@
break;
case IMAGE_TWEEN_DOWN:
ShowAlert("Down not yet implemented.");
- break;
- case EMIT_SIGNAL:
- sig =
etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry))));
- sou =
etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry))));
- edje_object_signal_emit(edje_o, sig, sou);
- emit_entry_item_append_ifnot(UI_SignalEmitEntry, sig);
- emit_entry_item_append_ifnot(UI_SourceEmitEntry, sou);
break;
case RUN_PROG:
if (etk_string_length_get(Cur.prog))
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- main.c 2 Jul 2008 01:07:02 -0000 1.43
+++ main.c 2 Jul 2008 02:48:58 -0000 1.44
@@ -140,7 +140,7 @@
edje_edit_save(edje_o);
evas_object_hide(edje_o);
- ConsolleClear();
+ consolle_clear();
//evas_object_del(edje_o);
//edje_o = NULL;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- main.h 2 Jul 2008 02:26:31 -0000 1.39
+++ main.h 2 Jul 2008 02:48:58 -0000 1.40
@@ -129,7 +129,6 @@
IMAGE_TWEEN_ADD,
IMAGE_TWEEN_DELETE,
SAVE_SCRIPT,
- EMIT_SIGNAL,
RUN_PROG
};
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
