Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_filelist_column.c ewl_filelist_icon.c ewl_icon.c
ewl_icon_theme.c ewl_icon_theme.h
Log Message:
*API Change*
use an int for the size in ewl_icon_theme_icon_path_get()
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_column.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_filelist_column.c 4 Jan 2007 05:09:47 -0000 1.22
+++ ewl_filelist_column.c 3 Feb 2007 03:12:23 -0000 1.23
@@ -461,7 +461,7 @@
ewl_filelist_column_cb_file_clicked, fl);
stock = ewl_filelist_stock_icon_get(fl, path);
- img = ewl_icon_theme_icon_path_get(stock, NULL);
+ img = ewl_icon_theme_icon_path_get(stock, 0);
if (img) ewl_icon_image_set(EWL_ICON(icon), img, stock);
ewl_container_child_append(EWL_CONTAINER(data), icon);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_icon.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_filelist_icon.c 4 Jan 2007 05:09:47 -0000 1.16
+++ ewl_filelist_icon.c 3 Feb 2007 03:12:23 -0000 1.17
@@ -268,7 +268,7 @@
ewl_filelist_icon_cb_icon_clicked, fl);
stock = ewl_filelist_stock_icon_get(fl, path);
- img = ewl_icon_theme_icon_path_get(stock, NULL);
+ img = ewl_icon_theme_icon_path_get(stock, 0);
if (img) ewl_icon_image_set(EWL_ICON(icon), img, stock);
ewl_container_child_append(EWL_CONTAINER(list->freebox), icon);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_icon.c 4 Jan 2007 05:09:47 -0000 1.30
+++ ewl_icon.c 3 Feb 2007 03:12:23 -0000 1.31
@@ -233,7 +233,7 @@
const char *path;
path = ewl_icon_theme_icon_path_get(
- EWL_ICON_IMAGE_LOADING, NULL),
+ EWL_ICON_IMAGE_LOADING, 0),
ewl_image_file_set(EWL_IMAGE(icon->image), path,
EWL_ICON_IMAGE_LOADING);
ewl_widget_show(icon->image);
@@ -635,7 +635,7 @@
/* if the image displayed is the loading image then we switch to the
* alt text */
- img = ewl_icon_theme_icon_path_get(EWL_ICON_IMAGE_LOADING, NULL);
+ img = ewl_icon_theme_icon_path_get(EWL_ICON_IMAGE_LOADING, 0);
file = ewl_icon_image_file_get(icon);
if (icon->image && !strcmp(img, file))
{
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_icon_theme.c 12 Jan 2007 10:32:48 -0000 1.14
+++ ewl_icon_theme.c 3 Feb 2007 03:12:23 -0000 1.15
@@ -88,16 +88,17 @@
/**
* @param icon: The Icon Spec icon name to lookup
- * @param size: The size of the icon to retrieve. A NULL value will cause
+ * @param size: The size of the icon to retrieve. A 0 value will cause
* the default size to be used.
* @return Returns the path to the icon we are looking for or NULL if none
found
* @brief Retrives the full path to the specified icon, or NULL if none found
*/
const char *
-ewl_icon_theme_icon_path_get(const char *icon, const char *size)
+ewl_icon_theme_icon_path_get(const char *icon, int size)
{
char *ret;
- const char *icon_size, *icon_theme;
+ const char *icon_theme;
+ char icon_size[16];
char key[256];
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -114,12 +115,11 @@
if (ewl_icon_theme_is_edje)
DRETURN_PTR(icon_theme, DLEVEL_STABLE);
- if (!size)
- icon_size = ewl_config_string_get(ewl_config,
+ if (size == 0)
+ size = ewl_config_int_get(ewl_config,
EWL_CONFIG_THEME_ICON_SIZE);
- else
- icon_size = size;
+ snprintf(icon_size, sizeof(icon_size), "%dx%d", size, size);
snprintf(key, sizeof(key), "[EMAIL PROTECTED]", icon, icon_size);
ret = ewl_icon_theme_icon_path_get_helper(icon, icon_size, icon_theme,
key, ewl_icon_theme_cache);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_icon_theme.h 4 Jan 2007 05:09:47 -0000 1.8
+++ ewl_icon_theme.h 3 Feb 2007 03:12:23 -0000 1.9
@@ -14,12 +14,12 @@
void ewl_icon_theme_theme_change(void);
-const char *ewl_icon_theme_icon_path_get(const char *icon,
- const char *size);
+const char *ewl_icon_theme_icon_path_get(const char *icon, int size);
-#define EWL_ICON_SIZE_SMALL "16x16" /**< 16x16 icons */
-#define EWL_ICON_SIZE_MEDIUM "22x22" /**< 22x22 icons */
-#define EWL_ICON_SIZE_LARGE "24x24" /**< 24x24 icons */
+#define EWL_ICON_SIZE_SMALL 16 /**< 16x16 icons */
+#define EWL_ICON_SIZE_MEDIUM 22 /**< 22x22 icons */
+#define EWL_ICON_SIZE_LARGE 24 /**< 24x24 icons */
+#define EWL_ICON_SIZE_HUGE 32 /**< 32x32 icons */
#define EWL_ICON_ADDRESS_BOOK_NEW "address-book-new" /**< address book icon
*/
#define EWL_ICON_APPLICATION_EXIT "application-exit" /**< application exit */
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
