Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_general.c
Log Message:
Add an Advanced Page to General Settings
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_general.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_general.c 31 Dec 2005 19:10:21 -0000 1.2
+++ e_int_config_general.c 1 Jan 2006 23:14:59 -0000 1.3
@@ -1,15 +1,16 @@
#include "e.h"
+#define FONT_CACHE_MAX (32 * 1024)
+#define IMAGE_CACHE_MAX (256 * 1024)
+
typedef struct _CFData CFData;
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
-/*
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
-*/
static void _dialog_cb_ok(void *data, E_Dialog *dia);
static void _dialog_cb_cancel(void *data, E_Dialog *dia);
@@ -20,7 +21,13 @@
double framerate;
int use_e_cursor;
int cursor_size;
-
+
+ /* Advanced */
+ int image_cache;
+ int font_cache;
+ int edje_cache;
+ int edje_collection_cache;
+
/* Not Implemented Yet
char *transition_start;
char *transition_desk;
@@ -30,10 +37,6 @@
double kill_timer_wait;
int ping_clients;
double pint_clients_wait;
- int image_cache;
- int font_cache;
- int edje_cache;
- int edje_collection_cache;
double cache_flush_interval;
*/
};
@@ -48,8 +51,8 @@
v.free_cfdata = _free_data;
v.basic.apply_cfdata = _basic_apply_data;
v.basic.create_widgets = _basic_create_widgets;
- v.advanced.apply_cfdata = NULL;
- v.advanced.create_widgets = NULL;
+ v.advanced.apply_cfdata = _advanced_apply_data;
+ v.advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(con, _("General Settings"), NULL, 0, &v, NULL);
return cfd;
@@ -62,13 +65,18 @@
cfdata->framerate = e_config->framerate;
cfdata->use_e_cursor = e_config->use_e_cursor;
cfdata->cursor_size = e_config->cursor_size;
+
+ /* Advanced */
+ cfdata->image_cache = e_config->image_cache;
+ cfdata->font_cache = e_config->font_cache;
+ cfdata->edje_cache = e_config->edje_cache;
+ cfdata->edje_collection_cache = e_config->edje_collection_cache;
+
/* Not Implemented Yet
cfdata->transition_start = e_config->transition_start;
cfdata->transition_desk = e_config->transition_desk;
cfdata->transition_change = e_config->transition_change;
*/
-
- /* Advanced */
}
static void *
@@ -77,7 +85,7 @@
CFData *cfdata;
cfdata = E_NEW(CFData, 1);
- _fill_data(cfdata);
+ _fill_data(cfdata);
return cfdata;
}
@@ -128,41 +136,40 @@
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
- Evas_Object *o, *of, *ob, *ot;
-
- _fill_data(cfdata);
-
+ Evas_Object *o, *of, *ob;
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
- ot = e_widget_table_add(evas, 1);
ob = e_widget_check_add(evas, _("Show Splash Screen At Boot"),
&(cfdata->show_splash));
- e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Framerate"));
- e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0, 200.0, 5.0, 0,
&(cfdata->framerate), NULL, 200);
- e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
- e_widget_framelist_object_append(of, ot);
+ e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Mouse Pointer Settings"), 0);
- ot = e_widget_table_add(evas, 1);
ob = e_widget_check_add(evas, _("Use E Mouse Pointer"),
&(cfdata->use_e_cursor));
- e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Mouse Pointer Size"));
- e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 1024, 1, 0, NULL,
&(cfdata->cursor_size), 200);
- e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
- e_widget_framelist_object_append(of, ot);
+ e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
-/*
static int
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
+ _basic_apply_data(cfd, cfdata);
+
e_border_button_bindings_ungrab_all();
+ e_config->font_cache = cfdata->font_cache;
+ e_config->image_cache = cfdata->image_cache;
+ e_config->edje_cache = cfdata->edje_cache;
+ e_config->edje_collection_cache = cfdata->edje_collection_cache;
e_border_button_bindings_grab_all();
e_config_save_queue();
@@ -172,13 +179,50 @@
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
- Evas_Object *o;
-
- _fill_data(cfdata);
+ Evas_Object *o, *ob, *of;
+ //_fill_data(cfdata);
+
+ o = e_widget_list_add(evas, 0, 0);
+ of = e_widget_framelist_add(evas, _("General Settings"), 0);
+ ob = e_widget_check_add(evas, _("Show Splash Screen At Boot"),
&(cfdata->show_splash));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add(evas, _("Framerate"));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0, 200.0, 5.0, 0,
&(cfdata->framerate), NULL, 200);
+ e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+ of = e_widget_framelist_add(evas, _("Mouse Pointer Settings"), 0);
+ ob = e_widget_check_add(evas, _("Use E Mouse Pointer"),
&(cfdata->use_e_cursor));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add(evas, _("Mouse Pointer Size"));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 1024, 1, 0, NULL,
&(cfdata->cursor_size), 200);
+ e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+ of = e_widget_framelist_add(evas, _("Cache Settings"), 0);
+ ob = e_widget_label_add(evas, _("Font Cache"));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, FONT_CACHE_MAX, 100.0,
0, NULL, &(cfdata->font_cache), 200);
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add(evas, _("Image Cache"));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, IMAGE_CACHE_MAX, 100.0,
0, NULL, &(cfdata->image_cache), 200);
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add(evas, _("Edje Cache"));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 256, 1, 0, NULL,
&(cfdata->edje_cache), 200);
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add(evas, _("Edje Collection Cache"));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 512, 1, 0, NULL,
&(cfdata->edje_collection_cache), 200);
+ e_widget_framelist_object_append(of, ob);
+
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
-*/
static void
_dialog_cb_ok(void *data, E_Dialog *dia)
-------------------------------------------------------
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
