Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c callbacks.h interface.c interface.h main.c
Log Message:
* Make clipping work
* Add some debugging code
* Include locale.h (this should fix Hisham error)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- callbacks.c 18 Feb 2008 16:44:21 -0000 1.53
+++ callbacks.c 18 Feb 2008 20:38:40 -0000 1.54
@@ -221,7 +221,8 @@
// system(cmd);
break;
case TOOLBAR_DEBUG:
- DebugInfo(FALSE);
+ //DebugInfo(FALSE);
+ edje_edit_print_internal_status(edje_o);
break;
case IMAGE_TWEEN_UP:
ShowAlert("Up not yet implemented.");
@@ -458,6 +459,23 @@
/* Recreate rel combobox */
PopulateRelComboBoxes(); //TODO do a focus-out callback for this (don't
need to do on every key!!)
}
+ return ETK_TRUE;
+}
+
+
+Etk_Bool
+on_CliptoComboBox_item_activated(Etk_Combobox *combobox, Etk_Combobox_Item
*item, void *data)
+{
+ char *to;
+ printf("Item Activated Signal on CliptoCombobox EMITTED\n");
+
+ to = etk_combobox_item_field_get(item, 1);
+ if (strcmp(to, "None"))
+ edje_edit_part_clip_to_set(edje_o, Cur.part->string, to);
+ else
+ edje_edit_part_clip_to_set(edje_o, Cur.part->string, NULL);
+
+
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- callbacks.h 18 Feb 2008 16:44:22 -0000 1.22
+++ callbacks.h 18 Feb 2008 20:38:40 -0000 1.23
@@ -13,6 +13,7 @@
void on_ColorCanvas_click (void *data, Evas *e, Evas_Object
*obj, void *event_info);
Etk_Bool on_ColorDialog_change (Etk_Object *object, void *data);
Etk_Bool on_PartNameEntry_text_changed (Etk_Object *object, void *data);
+Etk_Bool on_CliptoComboBox_item_activated (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
Etk_Bool on_PartEventsCheck_toggled (Etk_Object *object, void *data);
Etk_Bool on_PartEventsRepeatCheck_toggled (Etk_Object *object, void *data);
Etk_Bool on_StateEntry_text_changed (Etk_Object *object, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- interface.c 18 Feb 2008 16:44:22 -0000 1.60
+++ interface.c 18 Feb 2008 20:38:40 -0000 1.61
@@ -28,7 +28,7 @@
void
ConsolleLog(char *text)
{
- printf("LOG: %s\n", text);
+ //printf("LOG: %s\n", text);
stack = evas_list_prepend(stack, evas_stringshare_add(text));
@@ -38,15 +38,10 @@
stack = evas_list_remove_list(stack, evas_list_last(stack));
}
- // if (evas_list_nth(stack, 0))
edje_object_part_text_set(Consolle, "line1", evas_list_nth(stack, 0));
- // if (evas_list_nth(stack, 1))
edje_object_part_text_set(Consolle, "line2", evas_list_nth(stack, 1));
- // if (evas_list_nth(stack, 2))
edje_object_part_text_set(Consolle, "line3", evas_list_nth(stack, 2));
- // if (evas_list_nth(stack, 3))
edje_object_part_text_set(Consolle, "line4", evas_list_nth(stack, 3));
- // if (evas_list_nth(stack, 4))
edje_object_part_text_set(Consolle, "line5", evas_list_nth(stack, 4));
}
void
@@ -305,16 +300,18 @@
char buf[20];
printf("Populate 4 Rel Comboboxs\n");
//Stop signal propagation
- etk_signal_disconnect("active-item-changed",
ETK_OBJECT(UI_Rel1ToXComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1X_SPINNER);
- etk_signal_disconnect("active-item-changed",
ETK_OBJECT(UI_Rel1ToYComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL1Y_SPINNER);
- etk_signal_disconnect("active-item-changed",
ETK_OBJECT(UI_Rel2ToXComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2X_SPINNER);
- etk_signal_disconnect("active-item-changed",
ETK_OBJECT(UI_Rel2ToYComboBox), ETK_CALLBACK(on_RelToComboBox_changed), (void
*)REL2Y_SPINNER);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1X_SPINNER);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1Y_SPINNER);
+ etk_signal_block("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
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);
+ etk_signal_block("item-activated", ETK_OBJECT(UI_CliptoComboBox),
ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
etk_combobox_clear(ETK_COMBOBOX(UI_Rel1ToXComboBox));
etk_combobox_clear(ETK_COMBOBOX(UI_Rel1ToYComboBox));
etk_combobox_clear(ETK_COMBOBOX(UI_Rel2ToXComboBox));
etk_combobox_clear(ETK_COMBOBOX(UI_Rel2ToYComboBox));
+ etk_combobox_clear(ETK_COMBOBOX(UI_CliptoComboBox));
if (etk_string_length_get(Cur.group))
{
@@ -331,6 +328,10 @@
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToYComboBox),
etk_image_new_from_edje(EdjeFile,"NONE.PNG"),
"Interface");
+ etk_combobox_item_append(ETK_COMBOBOX(UI_CliptoComboBox),
+ etk_image_new_from_edje(EdjeFile,"NONE.PNG"),
+ "None");
+
// Add all the part to all the 4 combobox
Evas_List *parts;
int type;
@@ -361,6 +362,9 @@
etk_combobox_item_append(ETK_COMBOBOX(UI_Rel2ToYComboBox),
etk_image_new_from_edje(EdjeFile,buf),
(char *)l->data);
+ etk_combobox_item_append(ETK_COMBOBOX(UI_CliptoComboBox),
+ etk_image_new_from_edje(EdjeFile,buf),
+ (char *)l->data);
l = l->next;
}
@@ -368,10 +372,11 @@
}
//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);
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2X_SPINNER);
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2Y_SPINNER);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1X_SPINNER);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel1ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL1Y_SPINNER);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToXComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2X_SPINNER);
+ etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_Rel2ToYComboBox),
ETK_CALLBACK(on_RelToComboBox_changed), (void *)REL2Y_SPINNER);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_CliptoComboBox),
ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
}
void
@@ -514,12 +519,14 @@
UpdatePartFrame(void)
{
//Stop signal propagation
- etk_signal_block("text-changed",ETK_OBJECT(UI_PartNameEntry),
- on_PartNameEntry_text_changed, NULL);
- etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsCheck),
- on_PartEventsCheck_toggled, NULL);
- etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
- on_PartEventsRepeatCheck_toggled, NULL);
+ etk_signal_block("text-changed",ETK_OBJECT(UI_PartNameEntry),
+ on_PartNameEntry_text_changed, NULL);
+ etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsCheck),
+ on_PartEventsCheck_toggled, NULL);
+ etk_signal_block("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
+ on_PartEventsRepeatCheck_toggled, NULL);
+ etk_signal_block("item-activated", ETK_OBJECT(UI_CliptoComboBox),
+ ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
if (etk_string_length_get(Cur.part))
{
@@ -528,15 +535,44 @@
edje_edit_part_mouse_events_get(edje_o,
Cur.part->string));
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_PartEventsRepeatCheck),
edje_edit_part_repeat_events_get(edje_o,
Cur.part->string));
- }
-
+ }
+
+ /* Update clip_to combobox */
+ Etk_Combobox_Item *item = NULL;
+ const char *clipto;
+ int i;
+ char *p;
+
+ clipto = edje_edit_part_clip_to_get(edje_o, Cur.part->string);
+
+ if (clipto)
+ {
+ //Loop for all the item in the Combobox
+ i=1;
+ while ((item =
etk_combobox_nth_item_get(ETK_COMBOBOX(UI_CliptoComboBox),i)))
+ {
+ p = etk_combobox_item_field_get(item, 1);
+ if (!strcmp(p, clipto))
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_CliptoComboBox),item);
+ i++;
+ }
+ }
+ else
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_CliptoComboBox),
+ etk_combobox_first_item_get(ETK_COMBOBOX(UI_CliptoComboBox)));
+
+ edje_edit_string_free(clipto);
+
//ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_PartNameEntry),
- on_PartNameEntry_text_changed, NULL);
+ on_PartNameEntry_text_changed, NULL);
etk_signal_unblock("toggled",ETK_OBJECT(UI_PartEventsCheck),
- on_PartEventsCheck_toggled, NULL);
+ on_PartEventsCheck_toggled, NULL);
etk_signal_unblock("toggled",ETK_OBJECT(UI_PartEventsRepeatCheck),
- on_PartEventsRepeatCheck_toggled, NULL);
+ on_PartEventsRepeatCheck_toggled, NULL);
+ etk_signal_unblock("item-activated", ETK_OBJECT(UI_CliptoComboBox),
+ ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
+
}
@@ -2182,7 +2218,6 @@
{
Etk_Widget *table;
Etk_Widget *label;
- Etk_Widget *combo;
Etk_Widget *frame;
Etk_Widget *hbox;
@@ -2195,19 +2230,17 @@
UI_PartNameEntry = etk_entry_new();
etk_table_attach_default(ETK_TABLE(table),UI_PartNameEntry, 1, 1, 0, 0);
- //PartClipToComboBox
+ //UI_CliptoComboBox
label = etk_label_new("<b>Clip_to</b>");
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),
+ UI_CliptoComboBox = etk_combobox_new();
+ etk_combobox_column_add(ETK_COMBOBOX(UI_CliptoComboBox),
ETK_COMBOBOX_IMAGE, 24, ETK_COMBOBOX_NONE, 0.0);
- etk_combobox_column_add(ETK_COMBOBOX(combo),
+ etk_combobox_column_add(ETK_COMBOBOX(UI_CliptoComboBox),
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_combobox_build(ETK_COMBOBOX(UI_CliptoComboBox));
+ etk_table_attach_default(ETK_TABLE(table), UI_CliptoComboBox, 1, 1, 1, 1);
//events frame
frame = etk_frame_new("Mouse events");
@@ -2235,7 +2268,8 @@
ETK_CALLBACK(on_PartEventsCheck_toggled), NULL);
etk_signal_connect("toggled", ETK_OBJECT(UI_PartEventsRepeatCheck),
ETK_CALLBACK(on_PartEventsRepeatCheck_toggled), NULL);
-
+ etk_signal_connect("item-activated", ETK_OBJECT(UI_CliptoComboBox),
+ ETK_CALLBACK(on_CliptoComboBox_item_activated), NULL);
return table;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- interface.h 18 Feb 2008 16:44:22 -0000 1.30
+++ interface.h 18 Feb 2008 20:38:40 -0000 1.31
@@ -43,6 +43,7 @@
Etk_Widget *UI_PartTypeComboBox;
Etk_Widget *UI_PartEventsCheck;
Etk_Widget *UI_PartEventsRepeatCheck;
+Etk_Widget *UI_CliptoComboBox;
/* state frame objects */
Etk_Widget *UI_StateEntry;
//Etk_Widget *UI_StateIndexSpinner;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- main.c 18 Feb 2008 16:44:22 -0000 1.32
+++ main.c 18 Feb 2008 20:38:40 -0000 1.33
@@ -1,6 +1,7 @@
#include "config.h"
#include <string.h>
#include <errno.h>
+#include <locale.h>
#include <Edje.h>
#include <Edje_Edit.h>
#include <Etk.h>
@@ -148,12 +149,13 @@
Cur.tween = etk_string_clear(Cur.tween);
Cur.prog = etk_string_clear(Cur.prog);
- UpdateGroupFrame();
-
PopulateTree();
PopulateRelComboBoxes();
PopulateSourceComboEntry();
PopulateSignalComboEntry();
+
+ UpdateGroupFrame();
+ UpdatePartFrame();
//update FakeWin title
edje_object_part_text_set(EV_fakewin, "title", group);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
