Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
Ewl.h Makefile.am ewl_config.c ewl_config.h ewl_misc.c
ewl_private.h
Added Files:
ewl_icon_theme.c ewl_icon_theme.h
Log Message:
- Start working on the icon theme code.
- this works by using the icon naming spec to query the names from
ecore_desktop. it uses the Tango theme by default. if you don't have
this theme installed you won't see the icons.
- the theme is settable through examine (currently not working)
- the theme can be either the installed icon theme name or a .edj file. if
it's a .edj the group names need to match the icon name spec names for
each icon that is provided.
- the 'icon theme' test is a bit slow to start as it's trying to load up
a lot of stuff.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/Ewl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Ewl.h 11 Aug 2006 04:00:57 -0000 1.7
+++ Ewl.h 16 Aug 2006 15:04:50 -0000 1.8
@@ -324,6 +324,7 @@
#include <ewl_calendar.h>
#include <ewl_datepicker.h>
#include <ewl_icon.h>
+#include <ewl_icon_theme.h>
#include <ewl_iconbox.h>
#include <ewl_media.h>
#include <ewl_notebook.h>
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- Makefile.am 11 Aug 2006 04:00:57 -0000 1.30
+++ Makefile.am 16 Aug 2006 15:04:50 -0000 1.31
@@ -45,6 +45,7 @@
ewl_freebox.h \
ewl_grid.h \
ewl_icon.h \
+ ewl_icon_theme.h \
ewl_iconbox.h \
ewl_image.h \
ewl_imenu.h \
@@ -116,6 +117,7 @@
ewl_freebox.c \
ewl_grid.c \
ewl_icon.c \
+ ewl_icon_theme.c \
ewl_iconbox.c \
ewl_image.c \
ewl_list.c \
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_config.c 9 Jun 2006 19:33:14 -0000 1.12
+++ ewl_config.c 16 Aug 2006 15:04:50 -0000 1.13
@@ -10,6 +10,7 @@
EWL_CONFIG_ENGINE_NAME,
EWL_CONFIG_EVAS_FONT_CACHE,
EWL_CONFIG_EVAS_IMAGE_CACHE,
+ EWL_CONFIG_THEME_ICON_THEME_NAME,
EWL_CONFIG_THEME_NAME,
EWL_CONFIG_THEME_CACHE,
EWL_CONFIG_THEME_COLOR_CLASSES_OVERRIDE,
@@ -193,6 +194,7 @@
nc.evas.image_cache = ewl_config_int_get("/ewl/evas/image_cache");
nc.engine_name = ewl_config_str_get("/ewl/engine_name");
nc.theme.name = ewl_config_str_get("/ewl/theme/name");
+ nc.theme.icon_theme = ewl_config_str_get("/ewl/theme/icon/name");
nc.theme.cache = ewl_config_int_get("/ewl/theme/cache");
nc.theme.print_keys = ewl_config_int_get("/ewl/theme/print_keys");
nc.theme.print_signals = ewl_config_int_get("/ewl/theme/print_signals");
@@ -345,6 +347,8 @@
ewl_config.engine_name = nc.engine_name;
IF_FREE(ewl_config.theme.name);
ewl_config.theme.name = nc.theme.name;
+ IF_FREE(ewl_config.theme.icon_theme);
+ ewl_config.theme.icon_theme = nc.theme.icon_theme;
ewl_config.theme.cache = nc.theme.cache;
ewl_config.theme.print_keys = nc.theme.print_keys;
ewl_config.theme.print_signals = nc.theme.print_signals;
@@ -364,6 +368,7 @@
ecore_config_int_default("/ewl/evas/font_cache", 2097152);
ecore_config_int_default("/ewl/evas/image_cache", 8388608);
ecore_config_theme_default("/ewl/theme/name", "default");
+ ecore_config_string_default("/ewl/theme/icon/name", "Tango");
ecore_config_int_default("/ewl/theme/cache", 0);
ecore_config_int_default("/ewl/theme/color_classes/override", 0);
ecore_config_int_default("/ewl/theme/print_keys", 0);
@@ -380,6 +385,7 @@
"/ewl/evas/font_cache",
"/ewl/evas/image_cache",
"/ewl/theme/name",
+ "/ewl/theme/icon/name",
"/ewl/theme/cache",
"/ewl/theme/color_classes/override",
"/ewl/theme/print_keys",
@@ -405,13 +411,16 @@
ewl_config_listener, EWL_CONFIG_EVAS_IMAGE_CACHE, NULL);
ecore_config_listen("ewl_theme_name", "/ewl/theme/name",
ewl_config_listener, EWL_CONFIG_THEME_NAME, NULL);
+ ecore_config_listen("ewl_theme_icon_name",
"/ewl/theme/icon/name",
+ ewl_config_listener, EWL_CONFIG_THEME_ICON_THEME_NAME,
NULL);
ecore_config_listen("ewl_theme_cache", "/ewl/theme/cache",
ewl_config_listener, EWL_CONFIG_THEME_CACHE, NULL);
ecore_config_listen("ewl_theme_print_keys",
"/ewl/theme/print_keys",
ewl_config_listener, EWL_CONFIG_THEME_PRINT_KEYS, NULL);
ecore_config_listen("ewl_theme_print_signals",
"/ewl/theme/print_signals",
ewl_config_listener, EWL_CONFIG_THEME_PRINT_SIGNALS, NULL);
- ecore_config_listen("ewl_theme_cclases_override",
"/ewl/theme/color_classes/override",
+ ecore_config_listen("ewl_theme_cclases_override",
+ "/ewl/theme/color_classes/override",
ewl_config_listener,
EWL_CONFIG_THEME_COLOR_CLASSES_OVERRIDE, NULL);
}
@@ -452,6 +461,12 @@
IF_FREE(ewl_config.theme.name);
ewl_config.theme.name = ewl_config_str_get(key);
break;
+
+ case EWL_CONFIG_THEME_ICON_THEME_NAME:
+ IF_FREE(ewl_config.theme.icon_theme);
+ ewl_config.theme.icon_theme = ewl_config_str_get(key);
+ ewl_icon_theme_theme_change();
+ break;
case EWL_CONFIG_THEME_CACHE:
ewl_config.theme.cache = ewl_config_int_get(key);
@@ -470,7 +485,7 @@
break;
}
- DRETURN_INT(0, DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_config.h 9 Jun 2006 19:33:14 -0000 1.13
+++ ewl_config.h 16 Aug 2006 15:04:50 -0000 1.14
@@ -35,6 +35,7 @@
struct {
char *name; /**< Theme name */
+ char *icon_theme; /**< Icon theme name */
int cache; /**< Cache size */
int cclass_override; /**< Colour class override */
int print_keys; /**< Print theme keys as accessed */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- ewl_misc.c 13 Jul 2006 00:20:29 -0000 1.63
+++ ewl_misc.c 16 Aug 2006 15:04:50 -0000 1.64
@@ -122,6 +122,13 @@
DRETURN_INT(--ewl_init_count, DLEVEL_STABLE);
}
+ if (!ecore_desktop_init()) {
+ DERROR("Could not init ecore_desktop...\n");
+ evas_shutdown();
+ ecore_shutdown();
+ DRETURN_INT(--ewl_init_count, DLEVEL_STABLE);
+ }
+
if (!ecore_string_init()) {
DERROR("Could not init ecore strings....\n");
evas_shutdown();
@@ -307,6 +314,7 @@
evas_shutdown();
ecore_string_shutdown();
+ ecore_desktop_shutdown();
ecore_shutdown();
DRETURN_INT(ewl_init_count, DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_private.h 11 Aug 2006 03:35:20 -0000 1.5
+++ ewl_private.h 16 Aug 2006 15:04:50 -0000 1.6
@@ -3,6 +3,7 @@
#include <Ecore_Config.h>
#include <Ecore_File.h>
+#include <Ecore_Desktop.h>
#include <Edje.h>
#include <stdio.h>
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
