Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c interface.c interface.h
Log Message:
Remove warnings
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- callbacks.c 30 Jun 2008 23:01:23 -0000 1.72
+++ callbacks.c 30 Jun 2008 23:32:37 -0000 1.73
@@ -71,8 +71,6 @@
Etk_String *text;
const char *tween;
Etk_Tree_Row *row, *next, *prev;
- Etk_Combobox_Item *item;
- Etk_Iconbox_Icon *icon;
Evas_List *icons, *l;
switch ((int)data)
@@ -193,7 +191,7 @@
case IMAGE_TWEEN_ADD:
icons =
etk_iconbox_icon_get_selected(ETK_ICONBOX(UI_ImageBrowserIconbox));
for (l = icons; l; l = l->next)
- if (tween = etk_iconbox_icon_label_get(l->data))
+ if ((tween = etk_iconbox_icon_label_get(l->data)))
edje_edit_state_tween_add(edje_o, Cur.part->string,
Cur.state->string, tween);
if (icons)
@@ -286,17 +284,13 @@
void
on_Editing_click(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
- Evas_Object *o2;
int x, y;
- Evas_Event_Mouse_Down *ev = event_info;
- evas_pointer_output_xy_get(e, &x, &y);
+ evas_pointer_output_xy_get(e, &x, &y);
- printf("CLIK\n");
//o2 = evas_object_top_at_pointer_get(e);
- Evas_List *l = evas_objects_at_xy_get (e, ev->canvas.x, ev->canvas.y,
1, 1);
- printf("CLIK %x [%d %d] num: %d\n", obj, ev->canvas.x, ev->canvas.y,
evas_list_count(l));
-
+ //Evas_List *l = evas_objects_at_xy_get (e, ev->canvas.x, ev->canvas.y,
1, 1);
+ //printf("CLIK %x [%d %d] num: %d\n", obj, ev->canvas.x, ev->canvas.y,
evas_list_count(l));
}
void
@@ -330,24 +324,26 @@
/* save (TODO make some sort of feedback for the user)*/
else if (!strcmp(ev->key, "s") &&
evas_key_modifier_is_set(ev->modifiers, "Control"))
- on_AllButton_click(NULL, TOOLBAR_SAVE);
+ on_AllButton_click(NULL, (void *)TOOLBAR_SAVE);
}
/* Image Browser callbacks */
-Etk_Bool
+Etk_Bool
on_ImageBrowserIconbox_selected(Etk_Iconbox *iconbox, Etk_Iconbox_Icon *icon,
void *data)
{
const char *image;
image = etk_iconbox_icon_label_get(icon);
-
+
printf("CLICK ON: %s :)\n", image);
if (ImageBroserUpdate && etk_string_length_get(Cur.part) &&
etk_string_length_get(Cur.state))
{
edje_edit_state_image_set(edje_o, Cur.part->string, Cur.state->string,
image);
}
UpdateImageFrame();
+
+ return ETK_TRUE;
}
/* Tree callbacks */
@@ -1840,13 +1836,15 @@
Etk_Range *range;
double upper;
range = etk_scrolled_view_vscrollbar_get(
- etk_iconbox_scrolled_view_get (UI_ImageBrowserIconbox));
+
etk_iconbox_scrolled_view_get(ETK_ICONBOX(UI_ImageBrowserIconbox)));
etk_range_range_get(range, NULL, &upper);
etk_range_value_set(range, upper);
- etk_iconbox_icon_select(etk_iconbox_icon_get_by_label(
- UI_ImageBrowserIconbox,
-
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser))));
+ Etk_Iconbox_Icon *icon;
+ icon =
etk_iconbox_icon_get_by_label(ETK_ICONBOX(UI_ImageBrowserIconbox),
+ etk_filechooser_widget_selected_file_get(
+ ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
+ etk_iconbox_icon_select(icon);
break;
case FILECHOOSER_FONT:
@@ -1865,7 +1863,8 @@
}
etk_widget_hide(ETK_WIDGET(dialog));
}
- else{
+ else
+ {
etk_widget_hide(ETK_WIDGET(dialog));
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- interface.c 30 Jun 2008 22:25:30 -0000 1.74
+++ interface.c 30 Jun 2008 23:32:37 -0000 1.75
@@ -525,7 +525,7 @@
Evas_List *l, *images;
char buf[4096];
- etk_iconbox_clear(UI_ImageBrowserIconbox);
+ etk_iconbox_clear(ETK_ICONBOX(UI_ImageBrowserIconbox));
etk_iconbox_freeze(ETK_ICONBOX(UI_ImageBrowserIconbox));
images = l = edje_edit_images_list_get(edje_o);
@@ -827,7 +827,7 @@
etk_window_title_set(ETK_WINDOW(UI_ImageBrowserWin), buf);
//iconbox
- etk_iconbox_unselect_all(UI_ImageBrowserIconbox);
+ etk_iconbox_unselect_all(ETK_ICONBOX(UI_ImageBrowserIconbox));
pi = edje_edit_state_image_get(edje_o, Cur.part->string,
Cur.state->string);
if (pi)
{
@@ -841,10 +841,10 @@
//~ edje_edit_string_free(pi);
- int w, h;
- etk_image_size_get (etk_image_new_from_file(icon->filename,
icon->edje_group), &w, &h);
- printf("W: %d H: %d (%d)\n", w, h,
etk_image_new_from_file(icon->filename, icon->edje_group));
- etk_label_set(UI_ImageBrowserSizeLabel, "ciccio");
+ //int w, h;
+ //etk_image_size_get (etk_image_new_from_file(icon->filename,
icon->edje_group), &w, &h);
+ //printf("W: %d H: %d (%d)\n", w, h,
etk_image_new_from_file(icon->filename, icon->edje_group));
+ //etk_label_set(UI_ImageBrowserSizeLabel, "ciccio");
}
else
@@ -858,7 +858,7 @@
UpdateImageFrame(void)
{
//Etk_Combobox_Item *item = NULL;
- char *im, *pi;
+ const char *im;
//Stop signal propagation
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderLeftSpinner),
@@ -885,16 +885,16 @@
/* Update Image Browser */
UpdateImageBrowser();
- //Set the images laebl for normal image
- pi = edje_edit_state_image_get(edje_o, Cur.part->string, Cur.state->string);
- if (pi)
+ //Set the images label for normal image
+ im = edje_edit_state_image_get(edje_o, Cur.part->string, Cur.state->string);
+ if (im)
{
- etk_label_set(UI_ImageNameLabel, pi);
- edje_edit_string_free(pi);
+ etk_label_set(ETK_LABEL(UI_ImageNameLabel), im);
+ edje_edit_string_free(im);
}
else
{
- etk_label_set(UI_ImageNameLabel, "none");
+ etk_label_set(ETK_LABEL(UI_ImageNameLabel), "none");
}
//Set alpha and borders
@@ -1426,7 +1426,8 @@
etk_evas_object_set_object(ETK_EVAS_OBJECT(etk_evas_object), rect);
evas_object_show(rect);
etk_widget_show_all(etk_evas_object);
- evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN,
on_ColorCanvas_click, (void*)color_button_enum);
+ evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN,
+ on_ColorCanvas_click,
(void*)color_button_enum);
etk_container_add(ETK_CONTAINER(shadow), etk_evas_object);
etk_widget_size_request_set(etk_evas_object, w, h);
switch (color_button_enum)
@@ -2214,11 +2215,12 @@
Etk_Widget *button;
Etk_Widget *frame;
Etk_Widget *label;
+ Etk_Widget *image;
//ImageBrowserWin
UI_ImageBrowserWin = etk_window_new();
etk_window_title_set(ETK_WINDOW(UI_ImageBrowserWin), "Image Browser");
- etk_window_resize(UI_ImageBrowserWin, 590, 370);
+ etk_window_resize(ETK_WINDOW(UI_ImageBrowserWin), 590, 370);
etk_signal_connect("delete-event", ETK_OBJECT(UI_ImageBrowserWin),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_container_border_width_set(ETK_CONTAINER(UI_ImageBrowserWin), 5);
@@ -2252,18 +2254,18 @@
//EditImageButton
button = etk_button_new_with_label("Edit Image");
- Etk_Image *image = etk_image_new_from_edje(EdjeFile, "GIMP.PNG");
- etk_button_image_set(button, image);
- etk_button_style_set(button, ETK_BUTTON_BOTH_VERT);
+ image = etk_image_new_from_edje(EdjeFile, "GIMP.PNG");
+ etk_button_image_set(ETK_BUTTON(button), ETK_IMAGE(image));
+ etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_BOTH_VERT);
etk_widget_disabled_set(button, 1);
- etk_box_append(vbox, button, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox), button, 0, ETK_BOX_NONE, 0);
//ImageInfo
frame = etk_frame_new("Image Info");
- etk_box_append(vbox, frame, 0, ETK_BOX_EXPAND_FILL, 10);
+ etk_box_append(ETK_BOX(vbox), frame, 0, ETK_BOX_EXPAND_FILL, 10);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
- etk_container_add(frame, vbox2);
+ etk_container_add(ETK_CONTAINER(frame), vbox2);
label = etk_label_new("<b>name:</b>");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 0, NULL);
@@ -2291,6 +2293,8 @@
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_BROWSER_CLOSE);
etk_box_append(ETK_BOX(vbox), button, 0, ETK_BOX_NONE, 0);
+
+ return UI_ImageBrowserWin;
}
static Etk_Widget*
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- interface.h 30 Jun 2008 17:43:14 -0000 1.38
+++ interface.h 30 Jun 2008 23:32:37 -0000 1.39
@@ -176,6 +176,7 @@
void UpdatePositionFrame(void);
void UpdateComboPositionFrame(void);
void UpdateImageFrame(void);
+void UpdateImageBrowser(void);
void UpdateTextFrame(void);
void UpdatePartFrame(void);
void UpdateRectFrame(void);
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
