Enlightenment CVS committal
Author : moom
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/bin
Modified Files:
etk_iconbox_test.c etk_tree_test.c
Log Message:
* [Etk_Theme] Improve the API
* [Etk_Theme] Use default colors in etk_theme_color_get()
* [Etk_Theme] Get rid of the aliasing system since Edje can do that now
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_iconbox_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_iconbox_test.c 8 Oct 2006 10:11:59 -0000 1.10
+++ etk_iconbox_test.c 21 Mar 2007 18:15:26 -0000 1.11
@@ -97,7 +97,7 @@
return;
etk_iconbox_clear(iconbox);
- etk_iconbox_append(iconbox, etk_theme_icon_get(), "actions/go-up_48", "..");
+ etk_iconbox_append(iconbox, etk_theme_icon_path_get(), "actions/go-up_48",
"..");
/* First, add the folders */
ecore_list_goto_first(files);
@@ -110,7 +110,7 @@
if (!ecore_file_is_dir(file_path))
continue;
- etk_iconbox_append(iconbox, etk_theme_icon_get(), "places/folder_48",
filename);
+ etk_iconbox_append(iconbox, etk_theme_icon_path_get(),
"places/folder_48", filename);
}
/* Then the files */
@@ -140,7 +140,7 @@
}
}
- etk_iconbox_append(iconbox, etk_theme_icon_get(), icon ? icon :
"mimetypes/text-x-generic_48", filename);
+ etk_iconbox_append(iconbox, etk_theme_icon_path_get(), icon ? icon :
"mimetypes/text-x-generic_48", filename);
}
ecore_list_destroy(files);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- etk_tree_test.c 1 Feb 2007 19:14:52 -0000 1.40
+++ etk_tree_test.c 21 Mar 2007 18:15:26 -0000 1.41
@@ -16,7 +16,7 @@
Etk_Tree_Col *col1, *col2, *col3, *col4, *col5;
Etk_Tree_Row *row;
Etk_Widget *statusbar;
- Etk_Color c_warn, c_default2;
+ Etk_Color c_warn;
char row_name[128];
const char *stock_key;
int i;
@@ -66,38 +66,36 @@
* the speed when you insert a lot of rows. It is not really important if
you
* insert only some thousands of rows (here, we insert 3000 rows) */
etk_tree_freeze(ETK_TREE(tree));
- c_warn = etk_theme_color_get(ETK_COLOR_WARNING_FG);
- c_default2 = etk_theme_color_get(ETK_COLOR_DEFAULT2_FG);
+ etk_theme_color_get(NULL, ETK_COLOR_WARNING_FG, &c_warn.r, &c_warn.g,
&c_warn.b, &c_warn.a);
for (i = 0; i < 1000; i++)
{
- sprintf(row_name, "<font color=#%.2X%.2X%.2X%.2X>Row %d</font>",
- c_warn.r, c_warn.g, c_warn.b, c_warn.a, (i * 3) + 1);
+ sprintf(row_name, "Row %d", (i * 3) + 1);
stock_key = etk_stock_key_get(ETK_STOCK_PLACES_USER_HOME,
ETK_STOCK_SMALL);
row = etk_tree_row_append(ETK_TREE(tree), NULL,
- col1, etk_theme_icon_get(), stock_key, row_name,
+ col1, etk_theme_icon_path_get(), stock_key, row_name,
col2, 0.57,
col3, 7,
col4, PACKAGE_DATA_DIR "/images/1star.png", NULL,
col5, ETK_FALSE,
NULL);
- sprintf(row_name, "<font color=#%.2X%.2X%.2X%.2X>Row %d</font>",
- c_default2.r, c_default2.g, c_default2.b, c_default2.a, (i * 3) +
2);
+ sprintf(row_name, "Row %d", (i * 3) + 2);
stock_key = etk_stock_key_get(ETK_STOCK_PLACES_FOLDER, ETK_STOCK_SMALL);
row = etk_tree_row_append(ETK_TREE(tree), row,
- col1, etk_theme_icon_get(), stock_key, row_name,
+ col1, etk_theme_icon_path_get(), stock_key, row_name,
col2, 20.0,
col3, 19,
col4, PACKAGE_DATA_DIR "/images/2stars.png", NULL,
col5, ETK_TRUE,
NULL);
- sprintf(row_name, "Row %d", (i * 3) + 3);
+ sprintf(row_name, "<font color=#%.2X%.2X%.2X%.2X>Row %d</font>",
+ c_warn.r, c_warn.g, c_warn.b, c_warn.a, (i * 3) + 3);
stock_key = etk_stock_key_get(ETK_STOCK_TEXT_X_GENERIC, ETK_STOCK_SMALL);
etk_tree_row_append(ETK_TREE(tree), row,
- col1, etk_theme_icon_get(), stock_key, row_name,
+ col1, etk_theme_icon_path_get(), stock_key, row_name,
col2, 300.0,
- col3, 257,
+ col3, 257,
col4, PACKAGE_DATA_DIR "/images/3stars.png", NULL,
col5, ETK_TRUE,
NULL);
-------------------------------------------------------------------------
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
