From 3a75869cb3f4f25885249faef0830fd3fdf847ce Mon Sep 17 00:00:00 2001 From: skeezix Date: Tue, 22 Nov 2011 17:31:44 -0500 Subject: [PATCH] If load-icons-later is 2, then will skip auto loading icons entirely --- deployment/etc/pandora/conf/mmenu.conf | 4 ++-- minimenu/mmenu.conf | 4 ++-- minimenu/mmui.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deployment/etc/pandora/conf/mmenu.conf b/deployment/etc/pandora/conf/mmenu.conf index 7cd699b..aee2fab 100644 --- a/deployment/etc/pandora/conf/mmenu.conf +++ b/deployment/etc/pandora/conf/mmenu.conf @@ -19,8 +19,8 @@ skin_confname mmskin.conf pndrun /usr/pandora/scripts:./testdata/scripts # searchpath to locate "pnd_run.sh"; why aren't I looking in /etc/pandora/conf/apps for this? load_previews_now 0 # if >0, will try to load preview pics from pnds at boot time, not defer till later load_previews_later 1 # if >0, will try to load preview pics sometime (see defer_timer_ms as well) -load_icons_later 1 # if >0, will try to load icons after grid is showing, not during app scanning -load_visible_icons 1 # if >0, will try to load visible icons immediately (before render); combine with defered load for non-visible, say. +load_icons_later 1 # if 0 will load on start; if 1 will load 'later'; if '2' will not auto load icons at all +load_visible_icons 1 # if >0, will try to load visible icons immediately before render; ie: load as needed defer_icon_us 100000 # when background loading icons (load_icons_later), time between icon loadsa threaded_preview 0 # if 1, will try to load the preview in background, to avoid slowing up navigation loglevel 0 # 0 is debug, lots of crap; 3 is better, means 'errors only'. Output may screw up the wrapper! diff --git a/minimenu/mmenu.conf b/minimenu/mmenu.conf index 227f3a4..f1cb81c 100644 --- a/minimenu/mmenu.conf +++ b/minimenu/mmenu.conf @@ -19,8 +19,8 @@ skin_confname mmskin.conf pndrun /usr/pandora/scripts:./testdata/scripts # searchpath to locate "pnd_run.sh"; why aren't I looking in /etc/pandora/conf/apps for this? load_previews_now 0 # if >0, will try to load preview pics from pnds at boot time, not defer till later load_previews_later 0 # if >0, will try to load preview pics sometime (see defer_timer_ms as well) -load_icons_later 1 # if >0, will try to load icons after grid is showing, not during app scanning -load_visible_icons 1 # if >0, will try to load visible icons immediately (before render); combine with defered load for non-visible, say. +load_icons_later 1 # if 0 will load on start; if 1 will load 'later'; if '2' will not auto load icons at all +load_visible_icons 1 # if >0, will try to load visible icons immediately before render; ie: load as needed defer_icon_us 100000 # when background loading icons (load_icons_later), time between icon loadsa threaded_preview 0 # if 1, will try to load the preview in background, to avoid slowing up navigation loglevel 0 # 0 is debug, lots of crap; 3 is better, means 'errors only'. Output may screw up the wrapper! diff --git a/minimenu/mmui.c b/minimenu/mmui.c index 66283b7..bb8a4ef 100644 --- a/minimenu/mmui.c +++ b/minimenu/mmui.c @@ -4397,7 +4397,8 @@ char *ui_pick_custom_category ( unsigned char mode ) { } void ui_start_defered_icon_thread ( void ) { - if ( pnd_conf_get_as_int_d ( g_conf, "minimenu.load_icons_later", 0 ) == 0 ) { + + if ( pnd_conf_get_as_int_d ( g_conf, "minimenu.load_icons_later", 0 ) != 1 ) { return; } -- 2.39.2