mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-21 03:32:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enable proxy options in prefs GUI for OS3

Browse Source
This commit is contained in:
Chris Young 2016-01-27 00:07:14 +00:00
parent 2c380f818f
commit ca376741c6
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
amiga/gui_options.c
View File

@ -220,6 +220,7 @@ struct ami_gui_opts_window {
Object *objects[GID_OPTS_LAST]; Object *objects[GID_OPTS_LAST];
#ifndef __amigaos4__ #ifndef __amigaos4__
struct List clicktablist; struct List clicktablist;
struct List proxyoptslist;
#endif #endif
}; };
@ -319,6 +320,10 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window *gow)
proxyopts[3] = (char *)ami_utf8_easy((char *)messages_get("ProxyNTLM")); proxyopts[3] = (char *)ami_utf8_easy((char *)messages_get("ProxyNTLM"));
proxyopts[4] = NULL; proxyopts[4] = NULL;
#ifndef __amigaos4__
ami_gui_opts_array_to_list(&gow->proxyoptslist, proxyopts, NSA_LIST_CHOOSER);
#endif
nativebmopts[0] = (char *)ami_utf8_easy((char *)messages_get("None")); nativebmopts[0] = (char *)ami_utf8_easy((char *)messages_get("None"));
nativebmopts[1] = (char *)ami_utf8_easy((char *)messages_get("Scaled")); nativebmopts[1] = (char *)ami_utf8_easy((char *)messages_get("Scaled"));
nativebmopts[2] = (char *)ami_utf8_easy((char *)messages_get("All")); nativebmopts[2] = (char *)ami_utf8_easy((char *)messages_get("All"));
@ -468,6 +473,7 @@ static void ami_gui_opts_free(struct ami_gui_opts_window *gow)
#ifndef __amigaos4__ #ifndef __amigaos4__
ami_gui_opts_free_list(&gow->clicktablist, NSA_LIST_CLICKTAB); ami_gui_opts_free_list(&gow->clicktablist, NSA_LIST_CLICKTAB);
ami_gui_opts_free_list(&gow->proxyoptslist, NSA_LIST_CHOOSER);
#endif #endif
} }
@ -858,7 +864,6 @@ void ami_gui_opts_open(void)
*/ */
PAGE_Add, LayoutVObj, PAGE_Add, LayoutVObj,
LAYOUT_AddChild, LayoutVObj, LAYOUT_AddChild, LayoutVObj,
#ifdef __amigaos4__
LAYOUT_AddChild, LayoutVObj, LAYOUT_AddChild, LayoutVObj,
LAYOUT_SpaceOuter, TRUE, LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_BevelStyle, BVS_GROUP,
@ -867,7 +872,11 @@ void ami_gui_opts_open(void)
GA_ID, GID_OPTS_PROXY, GA_ID, GID_OPTS_PROXY,
GA_RelVerify, TRUE, GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE, CHOOSER_PopUp, TRUE,
#ifdef __amigaos4__
CHOOSER_LabelArray, proxyopts, CHOOSER_LabelArray, proxyopts,
#else
CHOOSER_Labels, &gow->proxyoptslist,
#endif
CHOOSER_Selected, proxytype, CHOOSER_Selected, proxytype,
ChooserEnd, ChooserEnd,
CHILD_Label, LabelObj, CHILD_Label, LabelObj,
@ -930,9 +939,6 @@ void ami_gui_opts_open(void)
LABEL_Text, gadlab[GID_OPTS_PROXY_BYPASS], LABEL_Text, gadlab[GID_OPTS_PROXY_BYPASS],
LabelEnd, LabelEnd,
LayoutEnd, // proxy LayoutEnd, // proxy
#else
#warning FIXME FOR OS3
#endif
CHILD_WeightedHeight, 0, CHILD_WeightedHeight, 0,
LAYOUT_AddChild, LayoutVObj, LAYOUT_AddChild, LayoutVObj,
LAYOUT_SpaceOuter, TRUE, LAYOUT_SpaceOuter, TRUE,
@ -1742,7 +1748,6 @@ static void ami_gui_opts_use(bool save)
nsoption_set_bool(os_mouse_pointers, false); nsoption_set_bool(os_mouse_pointers, false);
} }
#ifdef __amigaos4__
GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_PROXY],(ULONG *)&data); GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_PROXY],(ULONG *)&data);
if(data) if(data)
{ {
@ -1767,9 +1772,6 @@ static void ami_gui_opts_use(bool save)
GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_PROXY_BYPASS],(ULONG *)&data); GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_PROXY_BYPASS],(ULONG *)&data);
nsoption_set_charp(http_proxy_noproxy, (char *)strdup((char *)data)); nsoption_set_charp(http_proxy_noproxy, (char *)strdup((char *)data));
#else
#warning FIXME FOR OS3
#endif
GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FETCHMAX],(ULONG *)&nsoption_int(max_fetchers)); GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FETCHMAX],(ULONG *)&nsoption_int(max_fetchers));
GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FETCHHOST],(ULONG *)&nsoption_int(max_fetchers_per_host)); GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FETCHHOST],(ULONG *)&nsoption_int(max_fetchers_per_host));