Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_configure.c e_icon.c e_includes.h
e_int_config_background.c e_thumb.c
Added Files:
e_int_config_theme.c e_int_config_theme.h
Log Message:
- misc checks
- add theme selector (basic mode only) from Chady
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- Makefile.am 17 Dec 2005 11:21:53 -0000 1.88
+++ Makefile.am 19 Dec 2005 14:42:43 -0000 1.89
@@ -121,6 +121,7 @@
e_int_config_window_manipulation.h \
e_int_config_window_display.h \
e_int_config_background.h \
+e_int_config_theme.h \
e_int_config_menus.h \
e_deskpreview.h \
e_exebuf.h \
@@ -226,6 +227,7 @@
e_int_config_window_manipulation.c \
e_int_config_window_display.c \
e_int_config_background.c \
+e_int_config_theme.c \
e_int_config_menus.c \
e_deskpreview.c \
e_exebuf.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_configure.c 18 Dec 2005 10:44:55 -0000 1.17
+++ e_configure.c 19 Dec 2005 14:42:43 -0000 1.18
@@ -64,6 +64,7 @@
e_configure_standard_item_add(eco, "enlightenment/e", _("Window
Manipulation"), e_int_config_window_manipulation);
e_configure_standard_item_add(eco, "enlightenment/e", _("Window Display"),
e_int_config_window_display);
e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background
Settings"), e_int_config_background);
+ e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme
Selector"), e_int_config_theme);
e_configure_standard_item_add(eco, "enlightenment/modules", _("Module
Settings"), e_int_config_modules);
/* FIXME: we should have a way for modules to hook in here and add their
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_icon.c 22 Nov 2005 09:27:25 -0000 1.10
+++ e_icon.c 19 Dec 2005 14:42:43 -0000 1.11
@@ -42,6 +42,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
evas_object_image_file_set(sd->obj, file, NULL);
_e_icon_smart_reconfigure(sd);
@@ -53,6 +54,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
evas_object_image_file_set(sd->obj, file, key);
_e_icon_smart_reconfigure(sd);
@@ -64,6 +66,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
if (sd->obj) evas_object_del(sd->obj);
sd->obj = edje_object_add(evas_object_evas_get(obj));
@@ -77,6 +80,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
/* smart code here */
if (sd->obj) evas_object_del(sd->obj);
sd->obj = o;
@@ -90,6 +94,7 @@
char *file;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return NULL;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
{
edje_object_file_get(sd->obj, (const char **)&file, NULL);
@@ -105,6 +110,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
return;
evas_object_image_smooth_scale_set(sd->obj, smooth);
@@ -116,6 +122,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return 0;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
return 0;
return evas_object_image_smooth_scale_get(sd->obj);
@@ -127,6 +134,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
return;
evas_object_image_alpha_set(sd->obj, alpha);
@@ -138,6 +146,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return 0;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
return 0;
return evas_object_image_alpha_get(sd->obj);
@@ -149,6 +158,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
return evas_object_image_size_get(sd->obj, w, h);
}
@@ -168,6 +178,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (((sd->fill_inside) && (fill_inside)) ||
((!sd->fill_inside) && (!fill_inside))) return;
sd->fill_inside = fill_inside;
@@ -180,6 +191,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
return;
evas_object_image_size_set(sd->obj, w, h);
@@ -192,6 +204,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
+ if (!sd) return NULL;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
return NULL;
evas_object_image_size_get(sd->obj, w, h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_includes.h 17 Dec 2005 11:21:53 -0000 1.72
+++ e_includes.h 19 Dec 2005 14:42:43 -0000 1.73
@@ -101,6 +101,7 @@
#include "e_int_config_window_manipulation.h"
#include "e_int_config_window_display.h"
#include "e_int_config_background.h"
+#include "e_int_config_theme.h"
#include "e_int_config_menus.h"
#include "e_deskpreview.h"
#include "e_exebuf.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_background.c 18 Dec 2005 10:44:55 -0000 1.3
+++ e_int_config_background.c 19 Dec 2005 14:42:43 -0000 1.4
@@ -92,7 +92,8 @@
//e_bg_add(cfd->con, z, 0, 0, cfdata->file);
if (e_config->desktop_default_background)
evas_stringshare_del(e_config->desktop_default_background);
e_config->desktop_default_background = evas_stringshare_add(cfdata->file);
- e_bg_update();
+ e_bg_update();
+ e_config_save_queue();
return 1; /* Apply was OK */
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_thumb.c 8 Dec 2005 11:16:47 -0000 1.18
+++ e_thumb.c 19 Dec 2005 14:42:43 -0000 1.19
@@ -325,7 +325,7 @@
evas_object_move(clock, (w * 0.9), (h * 0.9));
evas_object_resize(clock, w * 0.1, h * 0.1);
/* start */
- evas_object_move(start, (w * 0.9), (h * 0.9));
+ evas_object_move(start, 0.1, (h * 0.9));
evas_object_resize(start, w * 0.1, h * 0.1);
/* pager */
evas_object_move(pager[0], (w * 0.3), (h * 0.9));
@@ -593,12 +593,15 @@
t->w,
t->h,
1);
- data = e_icon_data_get(tmp, &w, &h);
- e_icon_data_set(t->obj, data, w, h);
- evas_object_del(tmp);
- if(t->cb)
- t->cb(t->obj, t->data);
- free(t);
+ if (tmp && t)
+ {
+ data = e_icon_data_get(tmp, &w, &h);
+ e_icon_data_set(t->obj, data, w, h);
+ evas_object_del(tmp);
+ if(t->cb)
+ t->cb(t->obj, t->data);
+ free(t);
+ }
}
pid = -1;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
