Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_button_test.c etk_dnd_test.c etk_embed_test.c
etk_image_test.c etk_notebook_test.c etk_shadow_test.c
etk_table_test.c etk_tree_test.c
Log Message:
* [Etk_Image] *API BREAK* etk_image_new_from_file() and
etk_image_set_from_file() now takes a "key" parameter that allows you to
load images from Eet files. You can just set it to NULL if you don't
need it.
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_button_test.c 15 Aug 2006 15:59:01 -0000 1.12
+++ etk_button_test.c 29 Dec 2006 22:10:12 -0000 1.13
@@ -30,7 +30,7 @@
etk_tooltips_tip_set(button_normal, "This is a normal button");
etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE,
0);
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png",
NULL);
button_normal = etk_button_new_with_label("Button with an image");
etk_tooltips_tip_set(button_normal, "This is a normal button with an
image");
etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image));
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_dnd_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_dnd_test.c 6 Oct 2006 18:15:25 -0000 1.1
+++ etk_dnd_test.c 29 Dec 2006 22:10:12 -0000 1.2
@@ -63,7 +63,7 @@
sep = etk_hseparator_new();
etk_box_append(ETK_BOX(vbox2), sep, ETK_BOX_START, ETK_BOX_NONE, 0);
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png",
NULL);
button = etk_button_new_with_label("Drop an image here");
etk_widget_dnd_dest_set(button, ETK_TRUE);
dnd_types_num = 1;
@@ -158,7 +158,7 @@
printf("Widget got the file: %s\n", files->files[i]);
if ((image = strstr(files->files[i], "file://")) != NULL)
- etk_image_set_from_file(ETK_IMAGE(data), image + strlen("file://"));
+ etk_image_set_from_file(ETK_IMAGE(data), image + strlen("file://"),
NULL);
}
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_embed_test.c 6 Oct 2006 17:04:13 -0000 1.8
+++ etk_embed_test.c 29 Dec 2006 22:10:12 -0000 1.9
@@ -99,7 +99,7 @@
int i;
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png", NULL);
buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
buttons[1] = etk_check_button_new();
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_image_test.c 15 Aug 2006 16:33:26 -0000 1.7
+++ etk_image_test.c 29 Dec 2006 22:10:12 -0000 1.8
@@ -19,9 +19,9 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Image Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png",
NULL);
etk_image_keep_aspect_set(ETK_IMAGE(images[0]), ETK_TRUE);
- images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png",
NULL);
etk_image_keep_aspect_set(ETK_IMAGE(images[1]), ETK_FALSE);
labels[0] = etk_label_new("Keep aspect");
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_notebook_test.c 15 Aug 2006 16:33:26 -0000 1.11
+++ etk_notebook_test.c 29 Dec 2006 22:10:12 -0000 1.12
@@ -75,7 +75,7 @@
Etk_Widget *entries[6];
int i;
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png", NULL);
buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
buttons[1] = etk_check_button_new();
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_shadow_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_shadow_test.c 29 Oct 2006 11:39:54 -0000 1.1
+++ etk_shadow_test.c 29 Dec 2006 22:10:12 -0000 1.2
@@ -73,7 +73,7 @@
0, 0, ETK_TABLE_NONE);
sprintf(image_path, PACKAGE_DATA_DIR "/images/picture%d.png", i + 1);
- image = etk_image_new_from_file(image_path);
+ image = etk_image_new_from_file(image_path, NULL);
etk_container_add(ETK_CONTAINER(_etk_test_picture_shadows[i]), image);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_table_test.c 15 Aug 2006 16:33:26 -0000 1.11
+++ etk_table_test.c 29 Dec 2006 22:10:12 -0000 1.12
@@ -25,7 +25,7 @@
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png", NULL);
buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
buttons[1] = etk_check_button_new();
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- etk_tree_test.c 6 Oct 2006 17:04:13 -0000 1.35
+++ etk_tree_test.c 29 Dec 2006 22:10:12 -0000 1.36
@@ -178,7 +178,7 @@
etk_drag_types_set(drag, types, num_types);
etk_drag_data_set(drag, drag_data, strlen(drag_data) + 1);
button = etk_button_new_with_label(col1_string);
- etk_button_image_set(ETK_BUTTON(button),
ETK_IMAGE(etk_image_new_from_file(col3_path)));
+ etk_button_image_set(ETK_BUTTON(button),
ETK_IMAGE(etk_image_new_from_file(col3_path, NULL)));
etk_container_add(ETK_CONTAINER(drag), button);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
