Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c interface.h
Log Message:
compiler warnings --
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- callbacks.c 15 Jul 2007 05:01:04 -0000 1.25
+++ callbacks.c 3 Aug 2007 19:53:29 -0000 1.26
@@ -9,6 +9,8 @@
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);
int current_color_object;
@@ -137,7 +139,7 @@
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))
+ 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();
@@ -408,7 +410,8 @@
printf("Toggled Signal on EventsCheck EMITTED\n");
if (Cur.ep)
{
-
engrave_part_mouse_events_set(Cur.ep,etk_toggle_button_active_get(object));
+ engrave_part_mouse_events_set(Cur.ep,
+ etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object)));
}
}
void
@@ -512,7 +515,7 @@
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(UI_ImageTweenRadio))
+ if
(!etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio)))
{
engrave_part_state_image_normal_set(Cur.eps, image);
}else{
@@ -812,7 +815,7 @@
{
printf("Text Changed Signal on SourceEntry Emitted\n");
engrave_program_source_set(Cur.epr,
- etk_entry_text_get(etk_combobox_entry_entry_get(UI_SourceEntry)));
+
etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry)))));
}
void
on_SourceEntry_item_changed(Etk_Combobox_Entry *combo, void *data)
@@ -827,7 +830,7 @@
etk_combobox_entry_item_fields_get(active_item, NULL, &pname, NULL);
- etk_entry_text_set(etk_combobox_entry_entry_get(UI_SourceEntry),pname);
+
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),pname);
}
void
on_SignalEntry_text_changed(Etk_Object *object, void *data)
@@ -1347,7 +1350,7 @@
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(UI_ImageTweenRadio))
+ 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);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas.c 3 Jul 2007 02:17:44 -0000 1.14
+++ evas.c 3 Aug 2007 19:53:29 -0000 1.15
@@ -354,7 +354,7 @@
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 (UI_CurrentGroupSizeLabel, buf);
+ etk_label_set(ETK_LABEL(UI_CurrentGroupSizeLabel), buf);
}
void
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- interface.c 3 Aug 2007 19:07:31 -0000 1.32
+++ interface.c 3 Aug 2007 19:53:29 -0000 1.33
@@ -287,13 +287,13 @@
{
ep = l->data;
if (ep->type == ENGRAVE_PART_TYPE_RECT)
- etk_combobox_entry_item_append(UI_SourceEntry,
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
etk_image_new_from_edje (EdjeFile,"RECT.PNG"),ep->name);
if (ep->type == ENGRAVE_PART_TYPE_TEXT)
- etk_combobox_entry_item_append(UI_SourceEntry,
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
etk_image_new_from_edje (EdjeFile,"TEXT.PNG"),ep->name);
if (ep->type == ENGRAVE_PART_TYPE_IMAGE)
- etk_combobox_entry_item_append(UI_SourceEntry,
+ etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
etk_image_new_from_edje (EdjeFile,"IMAGE.PNG"),ep->name);
}
@@ -376,7 +376,8 @@
//Update Part
etk_entry_text_set(ETK_ENTRY(UI_PartNameEntry),Cur.ep->name);
- etk_toggle_button_active_set(UI_PartEventsCheck,Cur.ep->mouse_events);
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_PartEventsCheck),
+ Cur.ep->mouse_events);
//ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_PartNameEntry),
@@ -477,9 +478,7 @@
Engrave_Image *image;
int i;
Etk_Combobox_Item *item = NULL;
- Etk_Tree_Col *col1 = etk_tree_nth_col_get (ETK_TREE(UI_ImageTweenList),0);
- char buf[4096];
-
+
//Stop signal propagation
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderLeftSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed));
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderRightSpinner),ETK_CALLBACK(on_BorderSpinner_value_changed));
@@ -778,7 +777,8 @@
//Stop signal propagation
etk_signal_block("text-changed", ETK_OBJECT(UI_ProgramEntry),
ETK_CALLBACK(on_ProgramEntry_text_changed));
- etk_signal_block("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(UI_SourceEntry)),
+ etk_signal_block("text-changed",
+
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),
ETK_CALLBACK(on_SourceEntry_text_changed));
etk_signal_block("text-changed", ETK_OBJECT(UI_SignalEntry),
ETK_CALLBACK(on_SignalEntry_text_changed));
@@ -806,7 +806,8 @@
etk_entry_text_set(ETK_ENTRY(UI_ProgramEntry),Cur.epr->name);
//Update Source
-
etk_entry_text_set(etk_combobox_entry_entry_get(UI_SourceEntry),Cur.epr->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);
@@ -873,7 +874,8 @@
//Reenable signal propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_ProgramEntry),
ETK_CALLBACK(on_ProgramEntry_text_changed));
- etk_signal_unblock("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(UI_SourceEntry)),
+ etk_signal_unblock("text-changed",
+
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),
ETK_CALLBACK(on_SourceEntry_text_changed));
etk_signal_unblock("text-changed", ETK_OBJECT(UI_SignalEntry),
ETK_CALLBACK(on_SignalEntry_text_changed));
@@ -1510,7 +1512,6 @@
Etk_Widget *label;
Etk_Widget *table;
Etk_Tree_Col *col1;
- Etk_Widget *button;
//ImageFrame
UI_ImageFrame = etk_frame_new("Image");
@@ -1544,26 +1545,26 @@
//MoveUpTweenButton
UI_MoveUpTweenButton = etk_button_new_from_stock (ETK_STOCK_GO_UP);
- etk_button_style_set(UI_MoveUpTweenButton, ETK_BUTTON_ICON);
+ 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 (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);
- etk_button_style_set(UI_MoveDownTweenButton, ETK_BUTTON_ICON);
+ 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 (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);
- etk_button_style_set(UI_DeleteTweenButton, ETK_BUTTON_ICON);
+ 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 (UI_ImageTweenVBox, UI_DeleteTweenButton,
+ etk_box_append (ETK_BOX(UI_ImageTweenVBox), UI_DeleteTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//ImageTweenList
@@ -2033,9 +2034,9 @@
etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1,ETK_TABLE_NONE,0,0);
//etk_tooltips_tip_set(UI_SourceEntry, "<b>Source(s)</b> of the
signal.<br>The Part or Program that emit the signal<br>Wildcards can be used to
widen the scope, ex: \"button-*\"");
UI_SourceEntry = etk_combobox_entry_new();
- etk_combobox_entry_column_add(UI_SourceEntry, ETK_COMBOBOX_ENTRY_IMAGE, 24,
ETK_COMBOBOX_ENTRY_NONE, 0.0);
- etk_combobox_entry_column_add(UI_SourceEntry, ETK_COMBOBOX_ENTRY_LABEL, 75,
ETK_COMBOBOX_ENTRY_EXPAND, 0.0);
- etk_combobox_entry_build(UI_SourceEntry);
+ etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
ETK_COMBOBOX_ENTRY_IMAGE, 24, ETK_COMBOBOX_ENTRY_NONE, 0.0);
+ etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SourceEntry),
ETK_COMBOBOX_ENTRY_LABEL, 75, ETK_COMBOBOX_ENTRY_EXPAND, 0.0);
+ etk_combobox_entry_build(ETK_COMBOBOX_ENTRY(UI_SourceEntry));
etk_table_attach_default(ETK_TABLE(table), UI_SourceEntry, 1, 3, 1, 1);
//UI_SignalEntry
@@ -2150,7 +2151,7 @@
ETK_CALLBACK(on_ActionComboBox_changed), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_ProgramEntry),
ETK_CALLBACK(on_ProgramEntry_text_changed), NULL);
- etk_signal_connect("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(UI_SourceEntry)),
+ etk_signal_connect("text-changed",
ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEntry))),
ETK_CALLBACK(on_SourceEntry_text_changed), UI_SourceEntry);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SourceEntry),
ETK_CALLBACK(on_SourceEntry_item_changed), NULL);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- interface.h 15 Jul 2007 05:01:04 -0000 1.15
+++ interface.h 3 Aug 2007 19:53:29 -0000 1.16
@@ -108,9 +108,11 @@
void AddGroupToTree (Engrave_Group* group);
void AddPartToTree (Engrave_Part* part);
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);
@@ -120,6 +122,7 @@
void UpdateRectFrame (void);
void UpdateDescriptionFrame (void);
void UpdateProgFrame (void);
+void UpdateScriptFrame (void);
void UpdateWindowTitle (void);
void ShowFilechooser (int FileChooserType);
void ShowAlert (char* text);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
