Added disc cache options to the settings dialog

4 files changed, 212 insertions, 146 deletions

diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 4940c54a4..b056c4d02 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 68ecf64f4..72d957d92 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -127,67 +127,74 @@
 #define TOOLBAR_SSL_CERT_TRUSTED 1  /* BUTTON in tree TOOLBAR_SSL_CERT */

 

 #define SETTINGS 17  /* form/dial */

-#define SETTINGS_SAVE 1  /* BUTTON in tree SETTINGS */

-#define SETTINGS_ABORT 2  /* BUTTON in tree SETTINGS */

-#define SETTINGS_EDIT_DOWNLOAD_PATH 5  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_HOTLIST_FILE 6  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_CA_BUNDLE 7  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_CA_CERTS_PATH 8  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_EDITOR 9  /* FTEXT in tree SETTINGS */

-#define SETTINGS_BT_SEL_DOWNLOAD_DIR 96  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_SEL_HOTLIST 97  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_SEL_CA_BUNDLE 98  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_SEL_CA_CERTS 99  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_SEL_EDITOR 100  /* BUTTON in tree SETTINGS */

+#define SETTINGS_EDIT_DOWNLOAD_PATH 3  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_HOTLIST_FILE 4  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_CA_BUNDLE 5  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_CA_CERTS_PATH 6  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_EDITOR 7  /* FTEXT in tree SETTINGS */

+#define SETTINGS_BT_SEL_DOWNLOAD_DIR 12  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_SEL_HOTLIST 13  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_SEL_CA_BUNDLE 14  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_SEL_CA_CERTS 15  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_SEL_EDITOR 16  /* BUTTON in tree SETTINGS */

 /* Make sure that initial value is large enough! */

-#define SETTINGS_BT_SEL_FONT_RENDERER 16  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_ANTI_ALIASING 17  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_TRANSPARENCY 18  /* BUTTON in tree SETTINGS */

-#define SETTINGS_EDIT_DEF_FONT_SIZE 21  /* FTEXT in tree SETTINGS */

-#define SETTINGS_DEC_DEF_FONT_SIZE 22  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_INC_DEF_FONT_SIZE 23  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MIN_FONT_SIZE 25  /* FTEXT in tree SETTINGS */

-#define SETTINGS_DEC_MIN_FONT_SIZE 26  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_INC_MIN_FONT_SIZE 27  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MIN_GIF_DELAY 32  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_GIF_DELAY 33  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_GIF_DELAY 34  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_CB_ENABLE_ANIMATION 37  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_BG_IMAGES 39  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_FG_IMAGES 41  /* BUTTON in tree SETTINGS */

-#define SETTINGS_EDIT_MIN_REFLOW_PERIOD 44  /* FTEXT in tree SETTINGS */

-#define SETTINGS_DEC_INCREMENTAL_REFLOW 45  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_INC_INCREMENTAL_REFLOW 46  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_CB_USE_PROXY 48  /* BUTTON in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_HOST 49  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_PORT 51  /* FTEXT in tree SETTINGS */

-#define SETTINGS_CB_PROXY_AUTH 52  /* BUTTON in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_USERNAME 53  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_PASSWORD 54  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_MAX_FETCHERS 59  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_MAX_FETCHERS 60  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_MAX_FETCHERS 61  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_MAX_FETCHERS_PER_HOST 63  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MAX_FETCHERS_PER_HOST 64  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_MAX_FETCHERS_PER_HOST 65  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_CACHED_CONNECTIONS 67  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MAX_CACHED_CONNECTIONS 68  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_CACHED_CONNECTIONS 69  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_HOMEPAGE 71  /* FTEXT in tree SETTINGS */

-#define SETTINGS_CB_HIDE_ADVERTISEMENT 72  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_DISABLE_POPUP_WINDOWS 73  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_SEND_HTTP_REFERRER 74  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_SEND_DO_NOT_TRACK 75  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_CLEAR_HISTORY 77  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_SEL_LOCALE 79  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_GUI_LANG 81  /* BUTTON in tree SETTINGS */

-#define SETTINGS_INC_MEM_CACHE 84  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_MEM_CACHE 85  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_STR_MAX_MEM_CACHE 86  /* STRING in tree SETTINGS */

-#define SETTINGS_DEC_HISTORY_AGE 89  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_HISTORY_AGE 90  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_HISTORY_AGE 91  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_BT_GUI_TOUT 94  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_SEL_FONT_RENDERER 19  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_ANTI_ALIASING 20  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_TRANSPARENCY 21  /* BUTTON in tree SETTINGS */

+#define SETTINGS_EDIT_DEF_FONT_SIZE 24  /* FTEXT in tree SETTINGS */

+#define SETTINGS_DEC_DEF_FONT_SIZE 25  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_INC_DEF_FONT_SIZE 26  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MIN_FONT_SIZE 28  /* FTEXT in tree SETTINGS */

+#define SETTINGS_DEC_MIN_FONT_SIZE 29  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_INC_MIN_FONT_SIZE 30  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MIN_GIF_DELAY 35  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_GIF_DELAY 36  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_GIF_DELAY 37  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_CB_ENABLE_ANIMATION 40  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_BG_IMAGES 42  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_FG_IMAGES 44  /* BUTTON in tree SETTINGS */

+#define SETTINGS_EDIT_MIN_REFLOW_PERIOD 47  /* FTEXT in tree SETTINGS */

+#define SETTINGS_DEC_INCREMENTAL_REFLOW 48  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_INC_INCREMENTAL_REFLOW 49  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_CB_USE_PROXY 51  /* BUTTON in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_HOST 52  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_PORT 54  /* FTEXT in tree SETTINGS */

+#define SETTINGS_CB_PROXY_AUTH 55  /* BUTTON in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_USERNAME 56  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_PASSWORD 57  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_MAX_FETCHERS 62  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_MAX_FETCHERS 63  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_MAX_FETCHERS 64  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_MAX_FETCHERS_PER_HOST 66  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MAX_FETCHERS_PER_HOST 67  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_MAX_FETCHERS_PER_HOST 68  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_CACHED_CONNECTIONS 70  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MAX_CACHED_CONNECTIONS 71  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_CACHED_CONNECTIONS 72  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_HOMEPAGE 74  /* FTEXT in tree SETTINGS */

+#define SETTINGS_CB_HIDE_ADVERTISEMENT 75  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_DISABLE_POPUP_WINDOWS 76  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_SEND_HTTP_REFERRER 77  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_SEND_DO_NOT_TRACK 78  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_CLEAR_HISTORY 80  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_SEL_LOCALE 82  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_GUI_LANG 84  /* BUTTON in tree SETTINGS */

+#define SETTINGS_INC_MEM_CACHE 87  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_MEM_CACHE 88  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_STR_MAX_MEM_CACHE 89  /* FTEXT in tree SETTINGS */

+#define SETTINGS_DEC_HISTORY_AGE 92  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_HISTORY_AGE 93  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_HISTORY_AGE 94  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_BT_GUI_TOUT 97  /* BUTTON in tree SETTINGS */

+#define SETTINGS_INC_DISC_CACHE 101  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_DISC_CACHE 102  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_STR_MAX_DISC_CACHE 103  /* FTEXT in tree SETTINGS */

+#define SETTINGS_BT_CLEAR_CACHE 105  /* BUTTON in tree SETTINGS */

+#define SETTINGS_INC_CACHE_AGE 107  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_CACHE_AGE 108  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_CACHE_AGE 114  /* FTEXT in tree SETTINGS */

+#define SETTINGS_ABORT 112  /* BUTTON in tree SETTINGS */

+#define SETTINGS_SAVE 113  /* BUTTON in tree SETTINGS */

 

 #define MAINMENU 18  /* menu */

 #define MAINMENU_T_FILE 4  /* TITLE in tree MAINMENU */

diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 4b8ac69f3..06e0a31a3 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.651
 #N 99@32@AZAaza___  _@AZAaza090___  _@@_@

 #FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@

 #R 0@0@1@1@2@1@

-#M 11110100@0@7728@664@

+#M 11110100@0@7728@668@

 #T 0@2@TOOLBAR@@20@@

 #O 1@20@AREA_SEARCH@@

 #O 2@26@BT_SEARCH_FWD@@

@@ -112,67 +112,74 @@ ResourceMaster v3.651
 #T 15@2@TOOLBAR_HISTORY@@1@@

 #T 16@2@TOOLBAR_SSL_CERT@@2@@

 #O 1@26@TRUSTED@@

-#T 17@2@SETTINGS@@101@@

-#O 1@26@SAVE@@

-#O 2@26@ABORT@@

-#O 5@29@EDIT_DOWNLOAD_PATH@@

-#O 6@29@EDIT_HOTLIST_FILE@@

-#O 7@29@EDIT_CA_BUNDLE@@

-#O 8@29@EDIT_CA_CERTS_PATH@@

-#O 9@29@EDIT_EDITOR@@

-#O 96@26@BT_SEL_DOWNLOAD_DIR@@

-#O 97@26@BT_SEL_HOTLIST@@

-#O 98@26@BT_SEL_CA_BUNDLE@@

-#O 99@26@BT_SEL_CA_CERTS@@

-#O 100@26@BT_SEL_EDITOR@@

-#O 16@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@

-#O 17@26@CB_ANTI_ALIASING@@

-#O 18@26@CB_TRANSPARENCY@@

-#O 21@29@EDIT_DEF_FONT_SIZE@@

-#O 22@27@DEC_DEF_FONT_SIZE@@

-#O 23@27@INC_DEF_FONT_SIZE@@

-#O 25@29@EDIT_MIN_FONT_SIZE@@

-#O 26@27@DEC_MIN_FONT_SIZE@@

-#O 27@27@INC_MIN_FONT_SIZE@@

-#O 32@29@EDIT_MIN_GIF_DELAY@@

-#O 33@27@INC_GIF_DELAY@@

-#O 34@27@DEC_GIF_DELAY@@

-#O 37@26@CB_ENABLE_ANIMATION@@

-#O 39@26@CB_BG_IMAGES@@

-#O 41@26@CB_FG_IMAGES@@

-#O 44@29@EDIT_MIN_REFLOW_PERIOD@@

-#O 45@27@DEC_INCREMENTAL_REFLOW@@

-#O 46@27@INC_INCREMENTAL_REFLOW@@

-#O 48@26@CB_USE_PROXY@@

-#O 49@29@EDIT_PROXY_HOST@@

-#O 51@29@EDIT_PROXY_PORT@@

-#O 52@26@CB_PROXY_AUTH@@

-#O 53@29@EDIT_PROXY_USERNAME@@

-#O 54@29@EDIT_PROXY_PASSWORD@@

-#O 59@29@EDIT_MAX_FETCHERS@@

-#O 60@27@INC_MAX_FETCHERS@@

-#O 61@27@DEC_MAX_FETCHERS@@

-#O 63@27@DEC_MAX_FETCHERS_PER_HOST@@

-#O 64@29@EDIT_MAX_FETCHERS_PER_HOST@@

-#O 65@27@INC_MAX_FETCHERS_PER_HOST@@

-#O 67@27@DEC_CACHED_CONNECTIONS@@

-#O 68@29@EDIT_MAX_CACHED_CONNECTIONS@@

-#O 69@27@INC_CACHED_CONNECTIONS@@

-#O 71@29@EDIT_HOMEPAGE@@

-#O 72@26@CB_HIDE_ADVERTISEMENT@@

-#O 73@26@CB_DISABLE_POPUP_WINDOWS@@

-#O 74@26@CB_SEND_HTTP_REFERRER@@

-#O 75@26@CB_SEND_DO_NOT_TRACK@@

-#O 77@26@BT_CLEAR_HISTORY@@

-#O 79@26@BT_SEL_LOCALE@@

-#O 81@26@BT_GUI_LANG@@

-#O 84@27@INC_MEM_CACHE@@

-#O 85@27@DEC_MEM_CACHE@@

-#O 86@28@STR_MAX_MEM_CACHE@@

-#O 89@27@DEC_HISTORY_AGE@@

-#O 90@29@EDIT_HISTORY_AGE@@

-#O 91@27@INC_HISTORY_AGE@@

-#O 94@26@BT_GUI_TOUT@@

+#T 17@2@SETTINGS@@115@@

+#O 3@29@EDIT_DOWNLOAD_PATH@@

+#O 4@29@EDIT_HOTLIST_FILE@@

+#O 5@29@EDIT_CA_BUNDLE@@

+#O 6@29@EDIT_CA_CERTS_PATH@@

+#O 7@29@EDIT_EDITOR@@

+#O 12@26@BT_SEL_DOWNLOAD_DIR@@

+#O 13@26@BT_SEL_HOTLIST@@

+#O 14@26@BT_SEL_CA_BUNDLE@@

+#O 15@26@BT_SEL_CA_CERTS@@

+#O 16@26@BT_SEL_EDITOR@@

+#O 19@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@

+#O 20@26@CB_ANTI_ALIASING@@

+#O 21@26@CB_TRANSPARENCY@@

+#O 24@29@EDIT_DEF_FONT_SIZE@@

+#O 25@27@DEC_DEF_FONT_SIZE@@

+#O 26@27@INC_DEF_FONT_SIZE@@

+#O 28@29@EDIT_MIN_FONT_SIZE@@

+#O 29@27@DEC_MIN_FONT_SIZE@@

+#O 30@27@INC_MIN_FONT_SIZE@@

+#O 35@29@EDIT_MIN_GIF_DELAY@@

+#O 36@27@INC_GIF_DELAY@@

+#O 37@27@DEC_GIF_DELAY@@

+#O 40@26@CB_ENABLE_ANIMATION@@

+#O 42@26@CB_BG_IMAGES@@

+#O 44@26@CB_FG_IMAGES@@

+#O 47@29@EDIT_MIN_REFLOW_PERIOD@@

+#O 48@27@DEC_INCREMENTAL_REFLOW@@

+#O 49@27@INC_INCREMENTAL_REFLOW@@

+#O 51@26@CB_USE_PROXY@@

+#O 52@29@EDIT_PROXY_HOST@@

+#O 54@29@EDIT_PROXY_PORT@@

+#O 55@26@CB_PROXY_AUTH@@

+#O 56@29@EDIT_PROXY_USERNAME@@

+#O 57@29@EDIT_PROXY_PASSWORD@@

+#O 62@29@EDIT_MAX_FETCHERS@@

+#O 63@27@INC_MAX_FETCHERS@@

+#O 64@27@DEC_MAX_FETCHERS@@

+#O 66@27@DEC_MAX_FETCHERS_PER_HOST@@

+#O 67@29@EDIT_MAX_FETCHERS_PER_HOST@@

+#O 68@27@INC_MAX_FETCHERS_PER_HOST@@

+#O 70@27@DEC_CACHED_CONNECTIONS@@

+#O 71@29@EDIT_MAX_CACHED_CONNECTIONS@@

+#O 72@27@INC_CACHED_CONNECTIONS@@

+#O 74@29@EDIT_HOMEPAGE@@

+#O 75@26@CB_HIDE_ADVERTISEMENT@@

+#O 76@26@CB_DISABLE_POPUP_WINDOWS@@

+#O 77@26@CB_SEND_HTTP_REFERRER@@

+#O 78@26@CB_SEND_DO_NOT_TRACK@@

+#O 80@26@BT_CLEAR_HISTORY@@

+#O 82@26@BT_SEL_LOCALE@@

+#O 84@26@BT_GUI_LANG@@

+#O 87@27@INC_MEM_CACHE@@

+#O 88@27@DEC_MEM_CACHE@@

+#O 89@29@STR_MAX_MEM_CACHE@@

+#O 92@27@DEC_HISTORY_AGE@@

+#O 93@29@EDIT_HISTORY_AGE@@

+#O 94@27@INC_HISTORY_AGE@@

+#O 97@26@BT_GUI_TOUT@@

+#O 101@27@INC_DISC_CACHE@@

+#O 102@27@DEC_DISC_CACHE@@

+#O 103@29@STR_MAX_DISC_CACHE@@

+#O 105@26@BT_CLEAR_CACHE@@

+#O 107@27@INC_CACHE_AGE@@

+#O 108@27@DEC_CACHE_AGE@@

+#O 114@29@EDIT_CACHE_AGE@@

+#O 112@26@ABORT@@

+#O 113@26@SAVE@@

 #T 18@1@MAINMENU@@65@@

 #O 4@32@T_FILE@@

 #O 5@32@T_EDIT@@

@@ -214,4 +221,4 @@ ResourceMaster v3.651
 #O 61@28@M_CHOICES@@

 #O 62@28@M_VLOG@@

 #O 64@28@M_HELP_CONTENT@@

-#c 3770@

+#c 10993@

diff --git a/atari/settings.c b/atari/settings.c
index 000ad7d19..d7864e54a 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -24,22 +24,21 @@
 extern char options[PATH_MAX];
 extern GRECT desk_area;
 
-static float tmp_option_memory_cache_size;
 static float tmp_option_minimum_gif_delay;
+static unsigned tmp_option_memory_cache_size;
+static unsigned int tmp_option_disc_cache_size;
 static unsigned int tmp_option_expire_url;
+static unsigned int tmp_option_disc_cache_age;
 static unsigned int tmp_option_font_min_size;
 static unsigned int tmp_option_font_size;
 static unsigned int tmp_option_min_reflow_period;
 static unsigned int tmp_option_max_fetchers;
 static unsigned int tmp_option_max_fetchers_per_host;
 static unsigned int tmp_option_max_cached_fetch_handles;
-static colour tmp_option_atari_toolbar_bg;
 
 static int num_locales = 0;
 static char **locales = NULL;
 static short h_aes_win = 0;
-static short edit_obj = -1;
-static short any_obj = -1;
 static GUIWIN * settings_guiwin = NULL;
 static OBJECT * dlgtree;
 
@@ -95,8 +94,8 @@ static const char *gui_timeouts[]  = {
 #define LABEL_ICONSET_MAX_LEN 8
 #define INPUT_TOOLBAR_COLOR_MAX_LEN 6
 
-static void on_close(void);
-static void on_redraw(GRECT *clip);
+
+static void display_settings(void);
 static void form_event(int index, int external);
 static void apply_settings(void);
 static void save_settings(void);
@@ -109,7 +108,7 @@ static void set_text( short idx, char * text, int len )
     if( len > 254 )
         len = 254;
     if( text != NULL ) {
-        strncpy( spare, text, 254);
+        strncpy(spare, text, 254);
     } else {
         strcpy(spare, "");
     }
@@ -230,12 +229,20 @@ static void display_settings(void)
 
     tmp_option_expire_url = nsoption_int(expire_url);
     snprintf( spare, 255, "%02d", nsoption_int(expire_url) );
-    set_text( SETTINGS_EDIT_HISTORY_AGE, spare, 2 );
+    set_text( SETTINGS_EDIT_HISTORY_AGE, spare,  3);
 
     /* "Cache" tab: */
-    tmp_option_memory_cache_size = nsoption_int(memory_cache_size) / 1000000;
-    snprintf( spare, 255, "%03.1f", tmp_option_memory_cache_size );
-    set_text( SETTINGS_STR_MAX_MEM_CACHE, spare, 5 );
+    tmp_option_memory_cache_size = nsoption_int(memory_cache_size) / (1024*1024);
+    snprintf( spare, 255, "%d", tmp_option_memory_cache_size );
+    set_text( SETTINGS_STR_MAX_MEM_CACHE, spare, 4 );
+
+    tmp_option_disc_cache_size = nsoption_int(disc_cache_size) / (1024*1024);
+    snprintf( spare, 255, "%d", tmp_option_disc_cache_size );
+    set_text( SETTINGS_STR_MAX_DISC_CACHE, spare, 4 );
+
+    tmp_option_disc_cache_age = nsoption_int(disc_cache_age);
+    snprintf( spare, 255, "%02d", tmp_option_disc_cache_age );
+    set_text( SETTINGS_EDIT_CACHE_AGE, spare, 3 );
 
     /* "Paths" tab: */
     set_text( SETTINGS_EDIT_DOWNLOAD_PATH, nsoption_charp(downloads_path),
@@ -322,7 +329,7 @@ static void display_settings(void)
     toggle_objects();
 }
 
-static bool handle_filesystem_select_button(short rsc_bt)
+static void handle_filesystem_select_button(short rsc_bt)
 {
     bool require_path = false;
     bool is_folder = false;
@@ -570,20 +577,53 @@ static void form_event(int index, int external)
     case SETTINGS_INC_MEM_CACHE:
     case SETTINGS_DEC_MEM_CACHE:
         if( index == SETTINGS_DEC_MEM_CACHE )
-            tmp_option_memory_cache_size -= 0.1;
+            tmp_option_memory_cache_size -= 1;
         else
-            tmp_option_memory_cache_size += 0.1;
+            tmp_option_memory_cache_size += 1;
 
-        if( tmp_option_memory_cache_size < 0.5 )
-            tmp_option_memory_cache_size = 0.5;
-        if( tmp_option_memory_cache_size > 999.9 )
-            tmp_option_memory_cache_size = 999.9;
-        snprintf( spare, 255, "%03.1f", tmp_option_memory_cache_size );
+        if( tmp_option_memory_cache_size < 0 )
+            tmp_option_memory_cache_size = 1;
+        if( tmp_option_memory_cache_size > 999 )
+            tmp_option_memory_cache_size = 999;
+        snprintf( spare, 255, "%02d", tmp_option_memory_cache_size );
         set_text( SETTINGS_STR_MAX_MEM_CACHE, spare, 5 );
         is_button = true;
         OBJ_REDRAW(SETTINGS_STR_MAX_MEM_CACHE);
         break;
 
+    case SETTINGS_INC_DISC_CACHE:
+    case SETTINGS_DEC_DISC_CACHE:
+        if( index == SETTINGS_DEC_DISC_CACHE )
+            tmp_option_disc_cache_size -= 1;
+        else
+            tmp_option_disc_cache_size += 1;
+
+        if( tmp_option_disc_cache_size < 0 )
+            tmp_option_disc_cache_size = 1;
+        if( tmp_option_disc_cache_size > 9999 )
+            tmp_option_disc_cache_size = 9999;
+        snprintf( spare, 255, "%02d", tmp_option_disc_cache_size );
+        set_text( SETTINGS_STR_MAX_DISC_CACHE, spare, 5 );
+        is_button = true;
+        OBJ_REDRAW(SETTINGS_STR_MAX_DISC_CACHE);
+        break;
+
+    case SETTINGS_INC_CACHE_AGE:
+    case SETTINGS_DEC_CACHE_AGE:
+        if( index == SETTINGS_INC_CACHE_AGE )
+            tmp_option_disc_cache_age += 1;
+        else
+            tmp_option_disc_cache_age -= 1;
+
+        if( tmp_option_disc_cache_age > 99 )
+            tmp_option_disc_cache_age =  0;
+
+        snprintf( spare, 255, "%02d", tmp_option_disc_cache_age );
+        set_text( SETTINGS_EDIT_CACHE_AGE, spare, 2 );
+        is_button = true;
+        OBJ_REDRAW(SETTINGS_EDIT_CACHE_AGE);
+        break;
+
     case SETTINGS_INC_CACHED_CONNECTIONS:
     case SETTINGS_DEC_CACHED_CONNECTIONS:
         if( index == SETTINGS_INC_CACHED_CONNECTIONS )
@@ -788,8 +828,23 @@ static void apply_settings(void)
                        gemtk_obj_get_text(dlgtree, SETTINGS_EDIT_DOWNLOAD_PATH));
 
     /* "Cache" tab: */
+    tmp_option_memory_cache_size = atoi(gemtk_obj_get_text(dlgtree,
+                                                    SETTINGS_STR_MAX_MEM_CACHE));
+    tmp_option_expire_url = atoi(gemtk_obj_get_text(dlgtree,
+                                                    SETTINGS_EDIT_HISTORY_AGE));
+    tmp_option_disc_cache_size = atoi(gemtk_obj_get_text(dlgtree,
+                                                    SETTINGS_STR_MAX_DISC_CACHE));
+    tmp_option_disc_cache_age = atoi(gemtk_obj_get_text(dlgtree,
+                                                    SETTINGS_EDIT_CACHE_AGE));
     nsoption_set_int(memory_cache_size,
-                     tmp_option_memory_cache_size * 1000000);
+                     tmp_option_memory_cache_size * (1024*1024));
+
+    nsoption_set_int(expire_url, tmp_option_expire_url);
+
+    nsoption_set_int(disc_cache_size, tmp_option_disc_cache_size * (1024*1024));
+
+    nsoption_set_int(disc_cache_age, tmp_option_disc_cache_age);
+
 
     /* "Browser" tab: */
     nsoption_set_bool(target_blank,
@@ -798,8 +853,6 @@ static void apply_settings(void)
                       OBJ_SELECTED(SETTINGS_CB_HIDE_ADVERTISEMENT));
     nsoption_set_charp(accept_language,
                        gemtk_obj_get_text(dlgtree, SETTINGS_BT_SEL_LOCALE));
-    nsoption_set_int(expire_url,
-                     atoi(gemtk_obj_get_text(dlgtree, SETTINGS_EDIT_HISTORY_AGE)));
     nsoption_set_int(atari_gui_poll_timeout,
                      atoi(gemtk_obj_get_text(dlgtree, SETTINGS_BT_GUI_TOUT)));
     nsoption_set_bool(send_referer,
@@ -813,7 +866,6 @@ static void apply_settings(void)
 static short on_aes_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 {
     short retval = 0;
-    GRECT clip, work;
 
     if ((ev_out->emo_events & MU_MESAG) != 0) {
         // handle message