Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
background.c egui_graphics_dialog.c egui_graphics_dialog.h
theme.c
Log Message:
- Fix TODO item on them pesky preview windows
- Start freeing up some memory in the Entrance Smart objects used for previews
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- background.c 7 Nov 2006 21:10:34 -0000 1.14
+++ background.c 13 Nov 2006 10:24:44 -0000 1.15
@@ -28,7 +28,7 @@
/*this is an artifact that will have to go, once ew_*list can
handle selected first member automagically*/
PREFIX "/share/enlightenment/data/backgrounds",
bg_paths,
- "e/desktop/background",
+ /*"e/desktop/background",*/
"Entrance Configuration - Background",
"Backgrounds",
ENTRANCE_EDIT_KEY_CLIENT_BACKGROUND_STR,
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/egui_graphics_dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- egui_graphics_dialog.c 7 Nov 2006 21:10:34 -0000 1.5
+++ egui_graphics_dialog.c 13 Nov 2006 10:24:44 -0000 1.6
@@ -197,6 +197,10 @@
return;
ew_dialog_destroy(egd->win);
egd->win = NULL;
+ evas_free(egd->preview_evas);
+ egd->preview_evas = NULL;
+ es_free(egd->preview_smart);
+ egd->preview_smart = NULL;
}
static char*
@@ -284,33 +288,36 @@
else
file = _gd_get_path(egd, graphic);
- static Evas *evas = NULL;
- if(evas == NULL || egd->newly_created == 1)
- evas = ew_preview_evas_get(egd->img_preview, PREVIEW_WIDTH,
PREVIEW_HEIGHT, PREVIEW_V_WIDTH, PREVIEW_V_HEIGHT);
+ if(egd->preview_evas == NULL || egd->newly_created == 1)
+ egd->preview_evas = ew_preview_evas_get(egd->img_preview,
PREVIEW_WIDTH, PREVIEW_HEIGHT, PREVIEW_V_WIDTH, PREVIEW_V_HEIGHT);
+
char *bg_path = egui_get_current_bg();
char *theme_path = egui_get_current_theme();
- static Evas_Object *es = NULL;
- if(es == NULL || egd->newly_created == 1)
- es = es_new(evas);
+ /*static Evas_Object *es = NULL;*/
+ if(egd->preview_smart == NULL || egd->newly_created == 1)
+ egd->preview_smart = es_new(egd->preview_evas);
+ /*Evas_Object *es = es_new(egd->preview_evas);*/
if(egd->egds.keep_part == EGDS_BACKGROUND)
- es_background_edje_set(es, bg_path);
+ es_background_edje_set(egd->preview_smart, bg_path);
else
- es_background_edje_set(es, file);
+ es_background_edje_set(egd->preview_smart, file);
if(egd->egds.keep_part == EGDS_THEME)
- es_main_edje_set(es, theme_path);
+ es_main_edje_set(egd->preview_smart, theme_path);
else
- es_main_edje_set(es, file);
+ es_main_edje_set(egd->preview_smart, file);
- evas_object_resize(es, PREVIEW_V_WIDTH, PREVIEW_V_HEIGHT);
- evas_object_show(es);
+ evas_object_resize(egd->preview_smart, PREVIEW_V_WIDTH, PREVIEW_V_HEIGHT);
+ evas_object_show(egd->preview_smart);
free(bg_path);
free(theme_path);
free(file);
+
+
/*FIXME: selecting the first row doesn't work - maybe we select first row
while adding elements to the list:(*/
/*ew_list_first_row_select(list_thumbs);*/
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/egui_graphics_dialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- egui_graphics_dialog.h 7 Nov 2006 21:10:34 -0000 1.3
+++ egui_graphics_dialog.h 13 Nov 2006 10:24:44 -0000 1.4
@@ -10,7 +10,6 @@
char *name;
char *files_path;
Ecore_List *extra_file_paths;
- char *preview_edje_part;
char *dialog_title;
char *list_title;
char *entrance_edit_key;
@@ -35,6 +34,9 @@
Entrance_Widget group_pointer;
Egui_Graphics_Dialog_Settings egds;
+
+ Evas *preview_evas;
+ Evas_Object *preview_smart;
char *first;
int newly_created;
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- theme.c 7 Nov 2006 21:10:34 -0000 1.14
+++ theme.c 13 Nov 2006 10:24:44 -0000 1.15
@@ -13,7 +13,7 @@
"theme",
PREFIX "/share/entrance/themes",
NULL,
- "Preview",
+ /*"Preview",*/
"Entrance Configuration - Themes",
"Themes",
ENTRANCE_EDIT_KEY_CLIENT_THEME_STR,
-------------------------------------------------------------------------
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
