diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2009-08-18 15:38:09 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2009-08-18 15:38:09 +0000 |
commit | dc6e7f4627bd775c49cd02bb926d2f73509d116f (patch) | |
tree | d6c03e7ded9cf6268f6e11124a76a1cc018a9a10 /amiga | |
parent | 8d34071b8e928816f256c51910ba22f2234f64ad (diff) | |
download | netsurf-dc6e7f4627bd775c49cd02bb926d2f73509d116f.tar.gz netsurf-dc6e7f4627bd775c49cd02bb926d2f73509d116f.tar.bz2 |
Add missing code to apply the fetcher settings
Make some stuff private to gui_options.c
svn path=/trunk/netsurf/; revision=9349
Diffstat (limited to 'amiga')
-rwxr-xr-x | amiga/gui_options.c | 77 | ||||
-rwxr-xr-x | amiga/gui_options.h | 76 |
2 files changed, 77 insertions, 76 deletions
diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 26ec05a23..6831363dc 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -22,6 +22,8 @@ #include <proto/intuition.h> #include <proto/utility.h> #include <libraries/gadtools.h> +#include <exec/types.h> +#include <intuition/classusr.h> #include "amiga/object.h" #include "amiga/gui.h" @@ -60,6 +62,69 @@ enum { + GID_OPTS_MAIN=0, + GID_OPTS_HOMEPAGE, + GID_OPTS_HOMEPAGE_DEFAULT, + GID_OPTS_HOMEPAGE_CURRENT, + GID_OPTS_HIDEADS, + GID_OPTS_CONTENTLANG, + GID_OPTS_FROMLOCALE, + GID_OPTS_HISTORY, + GID_OPTS_REFERRAL, + GID_OPTS_FASTSCROLL, + GID_OPTS_SCREEN, + GID_OPTS_SCREENMODE, + GID_OPTS_SCREENNAME, + GID_OPTS_THEME, + GID_OPTS_PTRTRUE, + GID_OPTS_PTROS, + GID_OPTS_PROXY, + GID_OPTS_PROXY_HOST, + GID_OPTS_PROXY_PORT, + GID_OPTS_PROXY_USER, + GID_OPTS_PROXY_PASS, + GID_OPTS_FETCHMAX, + GID_OPTS_FETCHHOST, + GID_OPTS_FETCHCACHE, + GID_OPTS_NATIVEBM, + GID_OPTS_SCALEQ, + GID_OPTS_ANIMSPEED, + GID_OPTS_ANIMDISABLE, + GID_OPTS_FONT_SANS, + GID_OPTS_FONT_SERIF, + GID_OPTS_FONT_MONO, + GID_OPTS_FONT_CURSIVE, + GID_OPTS_FONT_FANTASY, + GID_OPTS_FONT_DEFAULT, + GID_OPTS_FONT_SIZE, + GID_OPTS_FONT_MINSIZE, + GID_OPTS_CACHE_MEM, + GID_OPTS_CACHE_DISC, + GID_OPTS_OVERWRITE, + GID_OPTS_DLDIR, + GID_OPTS_TAB_ACTIVE, + GID_OPTS_TAB_2, + GID_OPTS_CLIPBOARD, + GID_OPTS_CMENU_ENABLE, + GID_OPTS_CMENU_STICKY, + GID_OPTS_MARGIN_TOP, + GID_OPTS_MARGIN_LEFT, + GID_OPTS_MARGIN_BOTTOM, + GID_OPTS_MARGIN_RIGHT, + GID_OPTS_EXPORT_SCALE, + GID_OPTS_EXPORT_NOIMAGES, + GID_OPTS_EXPORT_NOBKG, + GID_OPTS_EXPORT_LOOSEN, + GID_OPTS_EXPORT_COMPRESS, + GID_OPTS_EXPORT_PASSWORD, + GID_OPTS_SAVE, + GID_OPTS_USE, + GID_OPTS_CANCEL, + GID_OPTS_LAST +}; + +enum +{ GRP_OPTS_HOMEPAGE = GID_OPTS_LAST, GRP_OPTS_CONTENTBLOCKING, GRP_OPTS_CONTENTLANGUAGE, @@ -105,6 +170,14 @@ enum #define OPTS_MAX_PROXY 5 #define OPTS_MAX_NATIVEBM 3 +struct ami_gui_opts_window { + struct Window *win; + Object *objects[OID_LAST]; + struct Gadget *gadgets[GID_OPTS_LAST]; + struct nsObject *node; + ULONG pad[6]; +}; + static struct ami_gui_opts_window *gow = NULL; CONST_STRPTR tabs[OPTS_MAX_TABS]; @@ -1256,6 +1329,10 @@ void ami_gui_opts_use(void) if(option_http_proxy_auth_pass) free(option_http_proxy_auth_pass); option_http_proxy_auth_pass = (char *)strdup((char *)data); + GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FETCHMAX],(ULONG *)&option_max_fetchers); + GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FETCHHOST],(ULONG *)&option_max_fetchers_per_host); + GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FETCHCACHE],(ULONG *)&option_max_cached_fetch_handles); + GetAttr(CHOOSER_Selected,gow->gadgets[GID_OPTS_NATIVEBM],(ULONG *)&option_cache_bitmaps); GetAttr(GA_Selected,gow->gadgets[GID_OPTS_SCALEQ],(ULONG *)&data); diff --git a/amiga/gui_options.h b/amiga/gui_options.h index 21db374d0..e7f0938d2 100755 --- a/amiga/gui_options.h +++ b/amiga/gui_options.h @@ -18,82 +18,6 @@ #ifndef AMIGA_GUI_OPTIONS_H #define AMIGA_GUI_OPTIONS_H - -#include <exec/types.h> -#include <intuition/classusr.h> -#include "amiga/gui.h" - -enum -{ - GID_OPTS_MAIN=0, - GID_OPTS_HOMEPAGE, - GID_OPTS_HOMEPAGE_DEFAULT, - GID_OPTS_HOMEPAGE_CURRENT, - GID_OPTS_HIDEADS, - GID_OPTS_CONTENTLANG, - GID_OPTS_FROMLOCALE, - GID_OPTS_HISTORY, - GID_OPTS_REFERRAL, - GID_OPTS_FASTSCROLL, - GID_OPTS_SCREEN, - GID_OPTS_SCREENMODE, - GID_OPTS_SCREENNAME, - GID_OPTS_THEME, - GID_OPTS_PTRTRUE, - GID_OPTS_PTROS, - GID_OPTS_PROXY, - GID_OPTS_PROXY_HOST, - GID_OPTS_PROXY_PORT, - GID_OPTS_PROXY_USER, - GID_OPTS_PROXY_PASS, - GID_OPTS_FETCHMAX, - GID_OPTS_FETCHHOST, - GID_OPTS_FETCHCACHE, - GID_OPTS_NATIVEBM, - GID_OPTS_SCALEQ, - GID_OPTS_ANIMSPEED, - GID_OPTS_ANIMDISABLE, - GID_OPTS_FONT_SANS, - GID_OPTS_FONT_SERIF, - GID_OPTS_FONT_MONO, - GID_OPTS_FONT_CURSIVE, - GID_OPTS_FONT_FANTASY, - GID_OPTS_FONT_DEFAULT, - GID_OPTS_FONT_SIZE, - GID_OPTS_FONT_MINSIZE, - GID_OPTS_CACHE_MEM, - GID_OPTS_CACHE_DISC, - GID_OPTS_OVERWRITE, - GID_OPTS_DLDIR, - GID_OPTS_TAB_ACTIVE, - GID_OPTS_TAB_2, - GID_OPTS_CLIPBOARD, - GID_OPTS_CMENU_ENABLE, - GID_OPTS_CMENU_STICKY, - GID_OPTS_MARGIN_TOP, - GID_OPTS_MARGIN_LEFT, - GID_OPTS_MARGIN_BOTTOM, - GID_OPTS_MARGIN_RIGHT, - GID_OPTS_EXPORT_SCALE, - GID_OPTS_EXPORT_NOIMAGES, - GID_OPTS_EXPORT_NOBKG, - GID_OPTS_EXPORT_LOOSEN, - GID_OPTS_EXPORT_COMPRESS, - GID_OPTS_EXPORT_PASSWORD, - GID_OPTS_SAVE, - GID_OPTS_USE, - GID_OPTS_CANCEL, - GID_OPTS_LAST -}; - -struct ami_gui_opts_window { - struct Window *win; - Object *objects[OID_LAST]; - struct Gadget *gadgets[GID_OPTS_LAST]; - struct nsObject *node; - ULONG pad[6]; -}; - void ami_gui_opts_open(void); BOOL ami_gui_opts_event(void); #endif |