enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

add max thumbnail size setting back, improve fileman config slider unit display 

SVN revision: 77343
This commit is contained in:
Mike Blumenkrantz 2012-10-03 06:41:32 +00:00
parent f5dd030696
commit 4f93b748ac
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/e_fm.c
View File

@ -2155,6 +2155,9 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
if (o) return o;
}
if (ic->sd->config->icon.max_thumb_size && (ic->info.statinfo.st_size > ic->sd->config->icon.max_thumb_size * 1024 * 1024))
ic->thumb_failed = EINA_TRUE;
/* create thumbnails for edje files */
if (_e_fm2_file_is_edje(ic->info.file))
{

4
src/modules/fileman/e_mod_config.c
View File

@ -396,13 +396,13 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__,
ob = e_widget_label_add(evas, _("Max File Size For Thumbnailing"));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 10.0, 1, 0,
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f MiB"), 0, 1024, 16, 0,
NULL, &(cfdata->icon.max_thumb_size), 150);
e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_label_add(evas, _("Spring Delay"));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 10.0, 1, 0,
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1.0, 10.0, 1, 0,
NULL, &(cfdata->view.spring_delay), 150);
e_widget_list_object_append(o, ob, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Behavior"), o, 0, 0, 0, 0, 0.5, 0.0);

6
src/modules/fileman/e_mod_main.c
View File

@ -345,6 +345,10 @@ _e_mod_fileman_config_load(void)
fileman_config->icon.max_thumb_size = 5;
IFMODCFGEND;
IFMODCFG(0x0116);
fileman_config->icon.max_thumb_size = 0;
IFMODCFGEND;
fileman_config->config_version = MOD_CONFIG_FILE_VERSION;
/* UCHAR's give nasty compile warnings about comparisons so not gonna limit those */
@ -357,7 +361,7 @@ _e_mod_fileman_config_load(void)
E_CONFIG_LIMIT(fileman_config->tooltip.delay, 0.0, 5.0);
E_CONFIG_LIMIT(fileman_config->tooltip.size, 10.0, 75.0);
E_CONFIG_LIMIT(fileman_config->view.spring_delay, 1, 10);
E_CONFIG_LIMIT(fileman_config->icon.max_thumb_size, 1, 10);
E_CONFIG_LIMIT(fileman_config->icon.max_thumb_size, 0, 1024);
e_config_save_queue();
}

2
src/modules/fileman/e_mod_main.h
View File

@ -4,7 +4,7 @@
/* Increment for Major Changes */
#define MOD_CONFIG_FILE_EPOCH 0x0001
/* Increment for Minor Changes (ie: user doesn't need a new config) */
#define MOD_CONFIG_FILE_GENERATION 0x0115
#define MOD_CONFIG_FILE_GENERATION 0x0116
#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
typedef struct _Config Config;