Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c interface.h main.h
Log Message:
* Add the ability to emit custom signals (exactly as edje_viewer)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- callbacks.c 30 Jun 2008 23:54:20 -0000 1.74
+++ callbacks.c 1 Jul 2008 01:56:28 -0000 1.75
@@ -38,7 +38,7 @@
evas_object_resize(embed_object, TREE_WIDTH, win_h - 55);
//Resize Consolle
- evas_object_move(Consolle, TREE_WIDTH + 5, win_h - 80);
+ evas_object_move(Consolle, TREE_WIDTH + 5, win_h - 105);
evas_object_resize(Consolle, win_w - TREE_WIDTH - 10, 75);
}
/* Catch all the signal from the editing edje object */
@@ -72,6 +72,7 @@
const char *tween;
Etk_Tree_Row *row, *next, *prev;
Evas_List *icons, *l;
+ char *sig, *sou;
switch ((int)data)
{
@@ -263,6 +264,11 @@
break;
case IMAGE_TWEEN_DOWN:
ShowAlert("Down not yet implemented.");
+ break;
+ case EMIT_SIGNAL:
+ sig =
etk_entry_text_get(etk_combobox_entry_entry_get(UI_SignalEmitEntry));
+ sou =
etk_entry_text_get(etk_combobox_entry_entry_get(UI_SourceEmitEntry));
+ edje_object_signal_emit(edje_o, sig, sou);
break;
case RUN_PROG:
if (etk_string_length_get(Cur.prog))
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- evas.c 1 Jul 2008 00:47:13 -0000 1.32
+++ evas.c 1 Jul 2008 01:56:28 -0000 1.33
@@ -286,12 +286,6 @@
on_StartDrag, (void*)DRAG_MOVEBOX);
evas_object_event_callback_add(EV_movebox, EVAS_CALLBACK_MOUSE_UP,
on_EndDrag, (void*)DRAG_MOVEBOX);
-
- // Create Consolle
- Consolle = edje_object_add(ecore_evas_get(UI_ecore_MainWin));
- edje_object_file_set(Consolle, EdjeFile, "Consolle");
- evas_object_show(Consolle);
-
//Place Fakewin
ev_move_fake(TREE_WIDTH + 15, 75);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- interface.c 30 Jun 2008 23:54:20 -0000 1.76
+++ interface.c 1 Jul 2008 01:56:28 -0000 1.77
@@ -3013,6 +3013,45 @@
return vbox;
}
+static Etk_Widget*
+create_signal_embed(void)
+{
+ Etk_Widget *hbox;
+ Etk_Widget *label;
+ Etk_Widget *button;
+
+ //hbox
+ hbox = etk_hbox_new(ETK_FALSE, 3);
+
+ //UI_SignalEmitEntry
+ label = etk_label_new("<b>Signal</b>");
+ etk_box_append(ETK_BOX(hbox), label, 0, ETK_BOX_NONE, 0);
+ UI_SignalEmitEntry = etk_combobox_entry_new();
+ etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry),
+ ETK_COMBOBOX_ENTRY_LABEL, 75, ETK_COMBOBOX_ENTRY_EXPAND,
0.0);
+ etk_combobox_entry_build(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry));
+ etk_box_append(ETK_BOX(hbox), UI_SignalEmitEntry, 0, ETK_BOX_NONE, 0);
+
+ //UI_SourceEmitEntry
+ label = etk_label_new("<b>Source</b>");
+ etk_box_append(ETK_BOX(hbox), label, 0, ETK_BOX_NONE, 0);
+ UI_SourceEmitEntry = etk_combobox_entry_new();
+ etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry),
+ ETK_COMBOBOX_ENTRY_LABEL, 75, ETK_COMBOBOX_ENTRY_EXPAND,
0.0);
+ etk_combobox_entry_build(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry));
+ etk_box_append(ETK_BOX(hbox), UI_SourceEmitEntry, 0, ETK_BOX_NONE, 0);
+
+ //button
+ button = etk_button_new_from_stock(ETK_STOCK_DIALOG_OK);
+ etk_object_properties_set(ETK_OBJECT(button), "label", "Emit", NULL);
+ etk_box_append(ETK_BOX(hbox), button, 0, ETK_BOX_NONE, 0);
+
+ etk_signal_connect("clicked", ETK_OBJECT(button),
+ ETK_CALLBACK(on_AllButton_click), (void*)EMIT_SIGNAL);
+
+ return hbox;
+}
+
static void
_embed_position_set(void *position_data, int *x, int *y)
{
@@ -3164,6 +3203,21 @@
etk_widget_show_all(UI_ScriptEmbed);
edje_object_part_swallow(edje_ui,"script_frame_swallow",
etk_embed_object_get(ETK_EMBED(UI_ScriptEmbed)));
+
+
+ //Consolle
+ Consolle = edje_object_add(ecore_evas_get(UI_ecore_MainWin));
+ edje_object_file_set(Consolle, EdjeFile, "Consolle");
+ evas_object_show(Consolle);
+
+ //SignalEmitEmbed
+ UI_SignalEmbed = etk_embed_new(UI_evas);
+ etk_container_add(ETK_CONTAINER(UI_SignalEmbed), create_signal_embed());
+ etk_embed_position_method_set(ETK_EMBED(UI_SignalEmbed),
+ _embed_position_set, UI_ecore_MainWin);
+ etk_widget_show_all(UI_SignalEmbed);
+ edje_object_part_swallow(Consolle,"signal_swallow",
+ etk_embed_object_get(ETK_EMBED(UI_SignalEmbed)));
//Filechooser
UI_FileChooserDialog = create_filechooser_dialog();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- interface.h 30 Jun 2008 23:32:37 -0000 1.39
+++ interface.h 1 Jul 2008 01:56:28 -0000 1.40
@@ -112,6 +112,9 @@
/* script frame objects */
Etk_Widget *UI_ScriptBox;
Etk_Widget *UI_ScriptSaveButton;
+/* signal emit embed objects */
+Etk_Widget *UI_SignalEmitEntry;
+Etk_Widget *UI_SourceEmitEntry;
/* program frame objects */
Etk_Widget *UI_ProgramEntry;
Etk_Widget *UI_ProgramEntryImage;
@@ -146,6 +149,7 @@
Etk_Widget *UI_ScriptEmbed;
Etk_Widget *UI_ImageEmbed;
Etk_Widget *UI_ToolbarEmbed;
+Etk_Widget *UI_SignalEmbed;
/* colors objects*/
Evas_Object *RectColorObject;
Evas_Object *TextColorObject;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- main.h 1 Jul 2008 00:47:13 -0000 1.36
+++ main.h 1 Jul 2008 01:56:28 -0000 1.37
@@ -114,6 +114,7 @@
IMAGE_TWEEN_ADD,
IMAGE_TWEEN_DELETE,
SAVE_SCRIPT,
+ EMIT_SIGNAL,
RUN_PROG
};
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
