summaryrefslogtreecommitdiff
path: root/frontends/amiga/gui_options.c
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/amiga/gui_options.c')
-rwxr-xr-xfrontends/amiga/gui_options.c760
1 files changed, 380 insertions, 380 deletions
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index fa8cdee35..1bd1015fd 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -641,7 +641,7 @@ void ami_gui_opts_open(void)
ami_gui_opts_setup(gow);
- gow->objects[OID_MAIN] = WindowObj,
+ gow->objects[OID_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, gadlab[LAB_OPTS_WINTITLE],
WA_Activate, TRUE,
@@ -655,154 +655,154 @@ void ami_gui_opts_open(void)
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
WA_IDCMP, IDCMP_GADGETUP | IDCMP_CLOSEWINDOW,
- WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ClickTabObj,
+ WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, (ClickTabObj,
GA_RelVerify, TRUE,
#ifdef __amigaos4__
GA_Text, tabs,
#else
CLICKTAB_Labels, &gow->clicktablist,
#endif
- CLICKTAB_PageGroup, PageObj,
+ CLICKTAB_PageGroup, (PageObj,
/*
** General
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_HOMEPAGE],
- LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE] = StringObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE] = (StringObj,
GA_ID, GID_OPTS_HOMEPAGE,
GA_RelVerify, TRUE,
STRINGA_TextVal, homepage_url_lc,
STRINGA_BufferPos,0,
- StringEnd,
- CHILD_Label, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_HOMEPAGE],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = ButtonObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = (ButtonObj,
GA_ID,GID_OPTS_HOMEPAGE_DEFAULT,
GA_Text,gadlab[GID_OPTS_HOMEPAGE_DEFAULT],
GA_RelVerify,TRUE,
- ButtonEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_CURRENT] = ButtonObj,
+ ButtonEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_CURRENT] = (ButtonObj,
GA_ID,GID_OPTS_HOMEPAGE_CURRENT,
GA_Text,gadlab[GID_OPTS_HOMEPAGE_CURRENT],
GA_RelVerify,TRUE,
- ButtonEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_BLANK] = ButtonObj,
+ ButtonEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_BLANK] = (ButtonObj,
GA_ID,GID_OPTS_HOMEPAGE_BLANK,
GA_Text,gadlab[GID_OPTS_HOMEPAGE_BLANK],
GA_RelVerify,TRUE,
- ButtonEnd,
- LayoutEnd,
- LayoutEnd, //homepage
+ ButtonEnd),
+ LayoutEnd),
+ LayoutEnd), //homepage
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_CONTENTBLOCKING],
- LAYOUT_AddChild, gow->objects[GID_OPTS_HIDEADS] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_HIDEADS] = (CheckBoxObj,
GA_ID, GID_OPTS_HIDEADS,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_HIDEADS],
GA_Selected, nsoption_bool(block_advertisements),
- CheckBoxEnd,
- LayoutEnd, // content blocking
- LAYOUT_AddChild, LayoutVObj,
+ CheckBoxEnd),
+ LayoutEnd), // content blocking
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_CONTENTLANGUAGE],
- LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = StringObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = (StringObj,
GA_ID, GID_OPTS_CONTENTLANG,
GA_RelVerify, TRUE,
GA_Disabled, acceptlangdisabled,
STRINGA_TextVal, nsoption_charp(accept_language),
STRINGA_BufferPos,0,
- StringEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = CheckBoxObj,
+ StringEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = (CheckBoxObj,
GA_ID, GID_OPTS_FROMLOCALE,
GA_Text, gadlab[GID_OPTS_FROMLOCALE],
GA_RelVerify, TRUE,
GA_Selected, nsoption_bool(accept_lang_locale),
- ButtonEnd,
+ CheckBoxEnd),
// CHILD_WeightedWidth, 0,
- LayoutEnd, // content language
- LayoutEnd, // content
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ LayoutEnd), // content language
+ LayoutEnd), // content
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_HISTORY],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = (IntegerObj,
GA_ID, GID_OPTS_HISTORY,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(expire_url),
INTEGER_Minimum, 0,
INTEGER_Maximum, 366,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_DAYS],
- LabelEnd,
- LayoutEnd,
+ LabelEnd),
+ LayoutEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_HISTORY],
- LabelEnd,
- LayoutEnd, // history
- LAYOUT_AddChild, LayoutVObj,
+ LabelEnd),
+ LayoutEnd), // history
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SCRIPTING],
- LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = (CheckBoxObj,
GA_ID, GID_OPTS_JAVASCRIPT,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_JAVASCRIPT],
GA_Selected, nsoption_bool(enable_javascript),
- CheckBoxEnd,
- LayoutEnd, // scripting
- LayoutEnd,
+ CheckBoxEnd),
+ LayoutEnd), // scripting
+ LayoutEnd),
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_PRIVACY],
- LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = (CheckBoxObj,
GA_ID, GID_OPTS_REFERRAL,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_REFERRAL],
GA_Selected, nsoption_bool(send_referer),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = (CheckBoxObj,
GA_ID, GID_OPTS_DONOTTRACK,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_DONOTTRACK],
GA_Selected, nsoption_bool(do_not_track),
- CheckBoxEnd,
- LayoutEnd, // misc
+ CheckBoxEnd),
+ LayoutEnd), // misc
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // pageadd
+ PageEnd), // pageadd
/*
** Display
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SCREEN],
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = RadioButtonObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = (RadioButtonObj,
GA_ID, GID_OPTS_SCREEN,
GA_RelVerify, TRUE,
#ifdef __amigaos4__
@@ -811,91 +811,91 @@ void ami_gui_opts_open(void)
RADIOBUTTON_Labels, &gow->screenoptslist,
#endif
RADIOBUTTON_Selected, screenoptsselected,
- RadioButtonEnd,
+ RadioButtonEnd),
CHILD_WeightedWidth,0,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = GetScreenModeObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = (GetScreenModeObj,
GA_ID, GID_OPTS_SCREENMODE,
GA_RelVerify, TRUE,
GA_Disabled,screenmodedisabled,
GETSCREENMODE_DisplayID,screenmodeid,
GETSCREENMODE_MinDepth, 0,
GETSCREENMODE_MaxDepth, 32,
- GetScreenModeEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObj,
+ GetScreenModeEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = (StringObj,
GA_ID, GID_OPTS_SCREENNAME,
GA_RelVerify, TRUE,
GA_Disabled,screennamedisabled,
STRINGA_TextVal, nsoption_charp(pubscreen_name),
STRINGA_BufferPos,0,
- StringEnd,
- LayoutEnd,
+ StringEnd),
+ LayoutEnd),
CHILD_WeightedHeight,0,
- LayoutEnd,
- LayoutEnd, // screen
+ LayoutEnd),
+ LayoutEnd), // screen
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_WINDOW],
- LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = (CheckBoxObj,
GA_ID, GID_OPTS_WIN_SIMPLE,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_WIN_SIMPLE],
GA_Selected, nsoption_bool(window_simple_refresh),
- CheckBoxEnd,
- LayoutEnd, // window
+ CheckBoxEnd),
+ LayoutEnd), // window
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_THEME],
- LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = (GetFileObj,
GA_ID, GID_OPTS_THEME,
GA_RelVerify, TRUE,
GETFILE_Drawer, nsoption_charp(theme),
GETFILE_DrawersOnly, TRUE,
GETFILE_ReadOnly, TRUE,
GETFILE_FullFileExpand, FALSE,
- GetFileEnd,
- LayoutEnd, // theme
+ GetFileEnd),
+ LayoutEnd), // theme
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MOUSE],
- LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = (CheckBoxObj,
GA_ID, GID_OPTS_PTRTRUE,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTRTRUE],
GA_Selected, nsoption_bool(truecolour_mouse_pointers),
GA_Disabled, ptr_disable,
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = (CheckBoxObj,
GA_ID, GID_OPTS_PTROS,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTROS],
GA_Selected, nsoption_bool(os_mouse_pointers),
GA_Disabled, ptr_disable,
- CheckBoxEnd,
- LayoutEnd, // mouse
+ CheckBoxEnd),
+ LayoutEnd), // mouse
CHILD_WeightedHeight,0,
- LAYOUT_AddImage, LabelObj,
+ LAYOUT_AddImage, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_RESTART],
- LabelEnd,
- LayoutEnd, // page vgroup
+ LabelEnd),
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // pageadd
+ PageEnd), // pageadd
/*
** Network
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_PROXY],
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = ChooserObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = (ChooserObj,
GA_ID, GID_OPTS_PROXY,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
@@ -905,19 +905,19 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->proxyoptslist,
#endif
CHOOSER_Selected, proxytype,
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = StringObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = (StringObj,
GA_ID, GID_OPTS_PROXY_HOST,
GA_RelVerify, TRUE,
GA_Disabled, proxyhostdisabled,
STRINGA_TextVal, nsoption_charp(http_proxy_host),
STRINGA_BufferPos,0,
- StringEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = IntegerObj,
+ StringEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = (IntegerObj,
GA_ID, GID_OPTS_PROXY_PORT,
GA_RelVerify, TRUE,
GA_Disabled, proxyhostdisabled,
@@ -925,103 +925,103 @@ void ami_gui_opts_open(void)
INTEGER_Minimum, 1,
INTEGER_Maximum, 65535,
INTEGER_Arrows, FALSE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, ":",
- LabelEnd,
- LayoutEnd, //host:port group
+ LabelEnd),
+ LayoutEnd), //host:port group
CHILD_WeightedHeight, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_HOST],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = StringObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = (StringObj,
GA_ID, GID_OPTS_PROXY_USER,
GA_RelVerify, TRUE,
GA_Disabled, proxyauthdisabled,
STRINGA_TextVal, nsoption_charp(http_proxy_auth_user),
STRINGA_BufferPos,0,
- StringEnd,
- CHILD_Label, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_USER],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = StringObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = (StringObj,
GA_ID, GID_OPTS_PROXY_PASS,
GA_RelVerify, TRUE,
GA_Disabled, proxyauthdisabled,
STRINGA_TextVal, nsoption_charp(http_proxy_auth_pass),
STRINGA_BufferPos,0,
- StringEnd,
- CHILD_Label, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_PASS],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_BYPASS] = StringObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_BYPASS] = (StringObj,
GA_ID, GID_OPTS_PROXY_BYPASS,
GA_RelVerify, TRUE,
GA_Disabled, proxybypassdisabled,
STRINGA_TextVal, nsoption_charp(http_proxy_noproxy),
STRINGA_BufferPos, 0,
- StringEnd,
- CHILD_Label, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_BYPASS],
- LabelEnd,
- LayoutEnd, // proxy
+ LabelEnd),
+ LayoutEnd), // proxy
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_FETCHING],
- LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = (IntegerObj,
GA_ID, GID_OPTS_FETCHMAX,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(max_fetchers),
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FETCHMAX],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = IntegerObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = (IntegerObj,
GA_ID, GID_OPTS_FETCHHOST,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(max_fetchers_per_host),
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FETCHHOST],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = IntegerObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = (IntegerObj,
GA_ID, GID_OPTS_FETCHCACHE,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(max_cached_fetch_handles),
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FETCHCACHE],
- LabelEnd,
- LayoutEnd,
+ LabelEnd),
+ LayoutEnd),
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Rendering
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_IMAGES],
- LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = ChooserObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = (ChooserObj,
GA_ID, GID_OPTS_NATIVEBM,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
@@ -1031,11 +1031,11 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->nativebmoptslist,
#endif
CHOOSER_Selected, nsoption_int(cache_bitmaps),
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_NATIVEBM],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = ChooserObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = (ChooserObj,
GA_ID, GID_OPTS_DITHERQ,
GA_RelVerify, TRUE,
GA_Disabled, ditherdisable,
@@ -1046,38 +1046,38 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->ditheroptslist,
#endif
CHOOSER_Selected, nsoption_int(dither_quality),
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_DITHERQ],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = (CheckBoxObj,
GA_ID, GID_OPTS_SCALEQ,
GA_Disabled, scaledisabled,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_SCALEQ],
GA_Selected, scaleselected,
- CheckBoxEnd,
- LayoutEnd, // images
+ CheckBoxEnd),
+ LayoutEnd), // images
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ANIMS],
- LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = (CheckBoxObj,
GA_ID, GID_OPTS_ANIMDISABLE,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_ANIMDISABLE],
GA_Selected, disableanims,
- CheckBoxEnd,
- LayoutEnd, //animations
+ CheckBoxEnd),
+ LayoutEnd), //animations
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_DPI],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = (IntegerObj,
GA_ID, GID_OPTS_DPI_Y,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(screen_ydpi),
@@ -1085,81 +1085,81 @@ void ami_gui_opts_open(void)
INTEGER_Maximum, 200,
INTEGER_Arrows, TRUE,
GA_Disabled, nsoption_bool(bitmap_fonts),
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_DPI],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_DPI_Y],
- LabelEnd,
- LayoutEnd, //animations
+ LabelEnd),
+ LayoutEnd), //animations
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Fonts
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_FONTFACES],
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SANS] = GetFontObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SANS] = (GetFontObj,
GA_ID, GID_OPTS_FONT_SANS,
GA_RelVerify, TRUE,
GETFONT_TextAttr, &fontsans,
GETFONT_OTagOnly, TRUE,
GETFONT_ScalableOnly, TRUE,
- GetFontEnd,
- CHILD_Label, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_SANS],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = GetFontObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = (GetFontObj,
GA_ID, GID_OPTS_FONT_SERIF,
GA_RelVerify, TRUE,
GETFONT_TextAttr, &fontserif,
GETFONT_OTagOnly, TRUE,
GETFONT_ScalableOnly, TRUE,
- GetFontEnd,
- CHILD_Label, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_SERIF],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = GetFontObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = (GetFontObj,
GA_ID, GID_OPTS_FONT_MONO,
GA_RelVerify, TRUE,
GETFONT_TextAttr, &fontmono,
GETFONT_OTagOnly, TRUE,
GETFONT_ScalableOnly, TRUE,
GETFONT_FixedWidthOnly, TRUE,
- GetFontEnd,
- CHILD_Label, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_MONO],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = GetFontObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = (GetFontObj,
GA_ID, GID_OPTS_FONT_CURSIVE,
GA_RelVerify, TRUE,
GETFONT_TextAttr, &fontcursive,
GETFONT_OTagOnly, TRUE,
GETFONT_ScalableOnly, TRUE,
- GetFontEnd,
- CHILD_Label, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_CURSIVE],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = GetFontObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = (GetFontObj,
GA_ID, GID_OPTS_FONT_FANTASY,
GA_RelVerify, TRUE,
GETFONT_TextAttr, &fontfantasy,
GETFONT_OTagOnly, TRUE,
GETFONT_ScalableOnly, TRUE,
- GetFontEnd,
- CHILD_Label, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_FANTASY],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = ChooserObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = (ChooserObj,
GA_ID, GID_OPTS_FONT_DEFAULT,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
@@ -1169,59 +1169,59 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->fontoptslist,
#endif
CHOOSER_Selected, nsoption_int(font_default) - PLOT_FONT_FAMILY_SANS_SERIF,
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_DEFAULT],
- LabelEnd,
- LayoutEnd, // font faces
+ LabelEnd),
+ LayoutEnd), // font faces
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = (IntegerObj,
GA_ID, GID_OPTS_FONT_SIZE,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(font_size) / 10,
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_PT],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_SIZE],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = (IntegerObj,
GA_ID, GID_OPTS_FONT_MINSIZE,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(font_min_size) / 10,
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_PT],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE],
- LabelEnd,
- LayoutEnd,
- LAYOUT_AddChild, LayoutVObj,
+ LabelEnd),
+ LayoutEnd),
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MISC],
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = (CheckBoxObj,
GA_ID, GID_OPTS_FONT_ANTIALIASING,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_FONT_ANTIALIASING],
@@ -1229,141 +1229,141 @@ void ami_gui_opts_open(void)
#ifndef __amigaos4__
GA_Disabled, TRUE,
#endif
- CheckBoxEnd,
+ CheckBoxEnd),
#ifndef __amigaos4__
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_BITMAP] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_BITMAP] = (CheckBoxObj,
GA_ID, GID_OPTS_FONT_BITMAP,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_FONT_BITMAP],
GA_Selected, nsoption_bool(bitmap_fonts),
- CheckBoxEnd,
+ CheckBoxEnd),
#endif
- LayoutEnd,
- LayoutEnd,
+ LayoutEnd),
+ LayoutEnd),
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Cache
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MEMCACHE],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = (IntegerObj,
GA_ID, GID_OPTS_CACHE_MEM,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(memory_cache_size) / 1048576,
INTEGER_Minimum, 0,
INTEGER_Maximum, 2048,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MB],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_CACHE_MEM],
- LabelEnd,
- LayoutEnd, // memory cache
+ LabelEnd),
+ LayoutEnd), // memory cache
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_DISCCACHE],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = (IntegerObj,
GA_ID, GID_OPTS_CACHE_DISC,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_uint(disc_cache_size) / 1048576,
INTEGER_Minimum, 0,
INTEGER_Maximum, 4096,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MB],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_CACHE_DISC],
- LabelEnd,
- LayoutEnd, // disc cache
+ LabelEnd),
+ LayoutEnd), // disc cache
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Tabs
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_TABS],
- LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ACTIVE] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ACTIVE] = (CheckBoxObj,
GA_ID, GID_OPTS_TAB_ACTIVE,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_TAB_ACTIVE],
GA_Selected, !nsoption_bool(new_tab_is_active),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_LAST] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_LAST] = (CheckBoxObj,
GA_ID, GID_OPTS_TAB_LAST,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_TAB_LAST],
GA_Selected, nsoption_bool(new_tab_last),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_2] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_2] = (CheckBoxObj,
GA_ID, GID_OPTS_TAB_2,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_TAB_2],
GA_Selected, nsoption_bool(button_2_tab),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ALWAYS] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ALWAYS] = (CheckBoxObj,
GA_ID, GID_OPTS_TAB_ALWAYS,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_TAB_ALWAYS],
GA_Selected, nsoption_bool(tab_always_show),
GA_Disabled, tab_always_show_disabled,
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = (CheckBoxObj,
GA_ID, GID_OPTS_TAB_CLOSE,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_TAB_CLOSE],
GA_Selected, nsoption_bool(tab_close_warn),
- CheckBoxEnd,
- LayoutEnd, // tabbed browsing
- LayoutEnd,
- LayoutEnd, // page vgroup
+ CheckBoxEnd),
+ LayoutEnd), // tabbed browsing
+ LayoutEnd),
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Advanced
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_DOWNLOADS],
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = CheckBoxObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = (CheckBoxObj,
GA_ID, GID_OPTS_OVERWRITE,
GA_RelVerify, TRUE,
GA_Disabled, FALSE,
GA_Text, gadlab[GID_OPTS_OVERWRITE],
GA_Selected, nsoption_bool(ask_overwrite),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = (CheckBoxObj,
GA_ID, GID_OPTS_NOTIFY,
GA_RelVerify, TRUE,
GA_Disabled, download_notify_disabled,
@@ -1372,39 +1372,39 @@ void ami_gui_opts_open(void)
#ifndef __amigaos4__
GA_Disabled, TRUE,
#endif
- CheckBoxEnd,
- LayoutEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = GetFileObj,
+ CheckBoxEnd),
+ LayoutEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = (GetFileObj,
GA_ID, GID_OPTS_DLDIR,
GA_RelVerify, TRUE,
GETFILE_Drawer, nsoption_charp(download_dir),
GETFILE_DrawersOnly, TRUE,
GETFILE_ReadOnly, TRUE,
GETFILE_FullFileExpand, FALSE,
- GetFileEnd,
- CHILD_Label, LabelObj,
+ GetFileEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_DLDIR],
- LabelEnd,
- LayoutEnd, // downloads
+ LabelEnd),
+ LayoutEnd), // downloads
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_BEHAVIOUR],
- LAYOUT_AddChild, gow->objects[GID_OPTS_STARTUP_NO_WIN] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_STARTUP_NO_WIN] = (CheckBoxObj,
GA_ID, GID_OPTS_STARTUP_NO_WIN,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_STARTUP_NO_WIN],
GA_Selected, nsoption_bool(startup_no_window),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_CLOSE_NO_QUIT] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CLOSE_NO_QUIT] = (CheckBoxObj,
GA_ID, GID_OPTS_CLOSE_NO_QUIT,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_CLOSE_NO_QUIT],
GA_Selected, nsoption_bool(close_no_quit),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = (CheckBoxObj,
GA_ID, GID_OPTS_DOCKY,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_DOCKY],
@@ -1412,242 +1412,242 @@ void ami_gui_opts_open(void)
#ifndef __amigaos4__
GA_Disabled, TRUE,
#endif
- CheckBoxEnd,
- LayoutEnd, // behaviour
+ CheckBoxEnd),
+ LayoutEnd), // behaviour
CHILD_WeightedHeight, 0,
- LayoutEnd, // hgroup
+ LayoutEnd), // hgroup
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_CLIPBOARD],
- LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = (CheckBoxObj,
GA_ID, GID_OPTS_CLIPBOARD,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_CLIPBOARD],
GA_Selected, nsoption_bool(clipboard_write_utf8),
- CheckBoxEnd,
- LayoutEnd, // clipboard
+ CheckBoxEnd),
+ LayoutEnd), // clipboard
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SEARCH],
- LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = (ChooserObj,
GA_ID, GID_OPTS_SEARCH_PROV,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
CHOOSER_Labels, websearch_list,
CHOOSER_Selected, nsoption_int(search_provider),
CHOOSER_MaxLabels, 40,
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_SEARCH_PROV],
- LabelEnd,
- LayoutEnd, // search
+ LabelEnd),
+ LayoutEnd), // search
CHILD_WeightedHeight, 0,
- LayoutEnd, // hgroup
+ LayoutEnd), // hgroup
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MISC],
LAYOUT_SpaceOuter, TRUE,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = (CheckBoxObj,
GA_ID, GID_OPTS_FASTSCROLL,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_FASTSCROLL],
GA_Selected, nsoption_bool(faster_scroll),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SELECTMENU] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SELECTMENU] = (CheckBoxObj,
GA_ID, GID_OPTS_SELECTMENU,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_SELECTMENU],
GA_Selected, !nsoption_bool(core_select_menu),
GA_Disabled, !ami_selectmenu_is_safe(),
- CheckBoxEnd,
- LayoutEnd, // misc
+ CheckBoxEnd),
+ LayoutEnd), // misc
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Export
*/
#ifdef WITH_PDF_EXPORT
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutHObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MARGINS],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_TOP,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_top),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_TOP],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_LEFT,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_left),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_LEFT],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_BOTTOM,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_bottom),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_BOTTOM],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_RIGHT,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_right),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_RIGHT],
- LabelEnd,
- LayoutEnd, // margins
+ LabelEnd),
+ LayoutEnd), // margins
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SCALING],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = (IntegerObj,
GA_ID, GID_OPTS_EXPORT_SCALE,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(export_scale),
INTEGER_Minimum, 0,
INTEGER_Maximum, 100,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, "%",
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_EXPORT_SCALE],
- LabelEnd,
- LayoutEnd, // scaling
+ LabelEnd),
+ LayoutEnd), // scaling
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_APPEARANCE],
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = (CheckBoxObj,
GA_ID, GID_OPTS_EXPORT_NOIMAGES,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_EXPORT_NOIMAGES],
GA_Selected, nsoption_bool(suppress_images),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOBKG] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOBKG] = (CheckBoxObj,
GA_ID, GID_OPTS_EXPORT_NOBKG,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_EXPORT_NOBKG],
GA_Selected, nsoption_bool(remove_backgrounds),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_LOOSEN] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_LOOSEN] = (CheckBoxObj,
GA_ID, GID_OPTS_EXPORT_LOOSEN,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_EXPORT_LOOSEN],
GA_Selected, nsoption_bool(enable_loosening),
- CheckBoxEnd,
- LayoutEnd, // appearance
+ CheckBoxEnd),
+ LayoutEnd), // appearance
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ADVANCED],
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = (CheckBoxObj,
GA_ID, GID_OPTS_EXPORT_COMPRESS,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_EXPORT_COMPRESS],
GA_Selected, nsoption_bool(enable_PDF_compression),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = (CheckBoxObj,
GA_ID, GID_OPTS_EXPORT_PASSWORD,
GA_RelVerify, TRUE,
GA_Disabled, TRUE,
GA_Text, gadlab[GID_OPTS_EXPORT_PASSWORD],
GA_Selected, nsoption_bool(enable_PDF_password),
- CheckBoxEnd,
- LayoutEnd, // export
+ CheckBoxEnd),
+ LayoutEnd), // export
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
#endif
- End, // pagegroup
- ClickTabEnd,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = ButtonObj,
+ End), // pagegroup
+ ClickTabEnd),
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = (ButtonObj,
GA_ID,GID_OPTS_SAVE,
GA_Text,gadlab[GID_OPTS_SAVE],
GA_RelVerify,TRUE,
- ButtonEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_USE] = ButtonObj,
+ ButtonEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_USE] = (ButtonObj,
GA_ID,GID_OPTS_USE,
GA_Text,gadlab[GID_OPTS_USE],
GA_RelVerify,TRUE,
- ButtonEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = ButtonObj,
+ ButtonEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = (ButtonObj,
GA_ID,GID_OPTS_CANCEL,
GA_Text,gadlab[GID_OPTS_CANCEL],
GA_RelVerify,TRUE,
- ButtonEnd,
- EndGroup, // save/use/cancel
- EndGroup, // main
- EndWindow;
+ ButtonEnd),
+ EndGroup), // save/use/cancel
+ EndGroup), // main
+ EndWindow);
gow->win = (struct Window *)RA_OpenWindow(gow->objects[OID_MAIN]);
ami_gui_win_list_add(gow, AMINS_GUIOPTSWINDOW, &ami_guiopts_table);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 08:39:46 +0000